Skip to content

Commit 51c6127

Browse files
committed
初步适配了浮动工具栏UI中 黑板 屏幕批注 的画笔颜色模式切换,但是仍有问题
问题:从黑板直接到屏幕批注时浅色画笔不会变成深色画笔
1 parent d7d3f02 commit 51c6127

File tree

1 file changed

+11
-4
lines changed

1 file changed

+11
-4
lines changed

Ink Canvas/MainWindow.xaml.cs

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1236,19 +1236,19 @@ private void BtnSwitchTheme_Click(object sender, RoutedEventArgs e)
12361236
}
12371237
else if (inkColor == 1)
12381238
{
1239-
BtnColorRed_Click(null,null);
1239+
BtnColorRed_Click(null, null);
12401240
}
12411241
else if (inkColor == 2)
12421242
{
1243-
BtnColorGreen_Click(null,null);
1243+
BtnColorGreen_Click(null, null);
12441244
}
12451245
else if (inkColor == 3)
12461246
{
1247-
BtnColorBlue_Click(null,null);
1247+
BtnColorBlue_Click(null, null);
12481248
}
12491249
else if (inkColor == 4)
12501250
{
1251-
BtnColorYellow_Click(null,null);
1251+
BtnColorYellow_Click(null, null);
12521252
}
12531253
}
12541254
else
@@ -6905,6 +6905,8 @@ private void SymbolIconRedo_MouseUp(object sender, MouseButtonEventArgs e)
69056905

69066906
private async void SymbolIconCursor_Click(object sender, RoutedEventArgs e)
69076907
{
6908+
SetDarkColors();
6909+
69086910
if (currentMode != 0)
69096911
{
69106912
ImageBlackboard_MouseUp(null, null);
@@ -6986,6 +6988,9 @@ private void ImageBlackboard_MouseUp(object sender, MouseButtonEventArgs e)
69866988
if (currentMode == 0)
69876989
{
69886990
//进入黑板
6991+
if (Settings.Canvas.UsingWhiteboard) SetDarkColors(); //在白板上用深色墨迹
6992+
else SetLightColors(); //在黑板上用浅色墨迹
6993+
69896994
Topmost = false;
69906995

69916996
if (BtnPPTSlideShowEnd.Visibility == Visibility.Collapsed)
@@ -7018,6 +7023,8 @@ private void ImageBlackboard_MouseUp(object sender, MouseButtonEventArgs e)
70187023
else
70197024
{
70207025
//关闭黑板
7026+
SetDarkColors();
7027+
70217028
Topmost = true;
70227029

70237030
if (isInMultiTouchMode) BorderMultiTouchMode_MouseUp(null, null);

0 commit comments

Comments
 (0)