Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

画笔颜色优化 #101

Merged
merged 14 commits into from
Mar 14, 2024
+137 −30
Merged

画笔颜色优化 #101

Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
5f06a07
新增 加载两种画笔颜色模式的配置文件，并应用于 Old UI 深浅色切换
STBBRD Oct 28, 2023
d7d3f02
更正一个注释中的错别字
STBBRD Oct 28, 2023
51c6127
初步适配了浮动工具栏UI中 黑板 屏幕批注 的画笔颜色模式切换，但是仍有问题
STBBRD Oct 28, 2023
02fa775
修复昨天的问题
STBBRD Oct 29, 2023
acc3a0c
完成深浅色切换、根据配置文件自定义颜色功能
STBBRD Oct 29, 2023
228b687
做了读取画笔颜色配置文件时的错误处理
STBBRD Nov 4, 2023
21d8a84
Merge branch 'WXRIW:master' into master
STBBRD Nov 19, 2023
01aad1f
将贡献者中的 STBBRD(我) 改为 ZongziTEK(我)
STBBRD Nov 19, 2023
525cc8e
修正 屏幕批注下按两次 Alt+E 变成浅色画笔 的问题
STBBRD Nov 19, 2023
7668ad3
将第一个关闭警告修改为普通的 MessageBox，以防止 Windows 关机时出现警告音
STBBRD Nov 25, 2023
f0c44fe
修复当使用橡皮时隐藏再显示画板导致显示浅色画笔的问题，恢复对关闭确认的修改
STBBRD Dec 2, 2023
f84a4f2
解决 MainWindow.xaml 冲突
STBBRD Dec 23, 2023
b8b9e7a
Merge branch 'master' into master
WXRIW Mar 14, 2024
8939eb1
Update MainWindow.xaml.cs
WXRIW Mar 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
167 changes: 137 additions & 30 deletions Ink Canvas/MainWindow.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ public MainWindow()
{
InitializeComponent();


BorderSettings.Visibility = Visibility.Collapsed;
StackPanelToolButtons.Visibility = Visibility.Collapsed;
BorderDrawShape.Visibility = Visibility.Collapsed;
Expand Down Expand Up @@ -154,16 +153,15 @@ private void TimerKillProcess_Elapsed(object sender, ElapsedEventArgs e)

#region Ink Canvas Functions

Color Ink_DefaultColor = Colors.Red;

DrawingAttributes drawingAttributes;
private void loadPenCanvas()
{
SetDarkColors();
try
{
//drawingAttributes = new DrawingAttributes();
drawingAttributes = inkCanvas.DefaultDrawingAttributes;
drawingAttributes.Color = Ink_DefaultColor;
drawingAttributes.Color = ((SolidColorBrush)BtnColorRed.Background).Color;

drawingAttributes.Height = 2.5;
drawingAttributes.Width = 2.5;
Expand Down Expand Up @@ -308,7 +306,7 @@ private void KeyChangeToEraser(object sender, ExecutedRoutedEventArgs e)
{
if (ImageEraserMask.Visibility == Visibility.Visible)
{
BtnColorRed_Click(sender, null);
BorderPenColorRed_MouseUp(null, null);
}
else
{
Expand Down Expand Up @@ -1251,17 +1249,26 @@ private void BtnSwitchTheme_Click(object sender, RoutedEventArgs e)
BtnExit.Foreground = Brushes.White;
GridBackgroundCover.Background = new SolidColorBrush(StringToColor("#FFF2F2F2"));
ThemeManager.Current.ApplicationTheme = ApplicationTheme.Dark;
SetDarkColors(); //在浅色背景上使用深色墨迹
if (inkColor == 0)
{
inkCanvas.DefaultDrawingAttributes.Color = Colors.White;
}
else if (inkColor == 1)
{
BtnColorRed_Click(null, null);
}
else if (inkColor == 2)
{
inkCanvas.DefaultDrawingAttributes.Color = StringToColor("#FF1ED760");
BtnColorGreen_Click(null, null);
}
else if (inkColor == 3)
{
BtnColorBlue_Click(null, null);
}
else if (inkColor == 4)
{
inkCanvas.DefaultDrawingAttributes.Color = StringToColor("#FFFFC000");
BtnColorYellow_Click(null, null);
}
}
else
Expand All @@ -1274,17 +1281,26 @@ private void BtnSwitchTheme_Click(object sender, RoutedEventArgs e)
BtnExit.Foreground = Brushes.Black;
GridBackgroundCover.Background = new SolidColorBrush(StringToColor("#FF1A1A1A"));
ThemeManager.Current.ApplicationTheme = ApplicationTheme.Light;
SetLightColors(); //在深色背景上使用浅色墨迹
if (inkColor == 0)
{
inkCanvas.DefaultDrawingAttributes.Color = Colors.Black;
inkCanvas.DefaultDrawingAttributes.Color = Colors.White;
}
else if (inkColor == 1)
{
BtnColorRed_Click(null, null);
}
else if (inkColor == 2)
{
inkCanvas.DefaultDrawingAttributes.Color = StringToColor("#FF169141");
BtnColorGreen_Click(null, null);
}
else if (inkColor == 3)
{
BtnColorBlue_Click(null, null);
}
else if (inkColor == 4)
{
inkCanvas.DefaultDrawingAttributes.Color = StringToColor("#FFF38B00");
BtnColorYellow_Click(null, null);
}
}
if (!Settings.Appearance.IsTransparentButtonBackground)
Expand Down Expand Up @@ -1353,7 +1369,7 @@ private void BtnHideInkCanvas_Click(object sender, RoutedEventArgs e)


// Auto-clear Strokes
// 很烦, 要重新来, 要等待截图完成再清理笔记
// 很烦, 要重新来, 要等待截图完成再清理笔迹
if (BtnPPTSlideShowEnd.Visibility != Visibility.Visible)
{
if (isLoaded && Settings.Automation.IsAutoClearWhenExitingWritingMode)
Expand Down Expand Up @@ -1561,17 +1577,22 @@ private void BtnColorRed_Click(object sender, RoutedEventArgs e)
{
inkColor = 1;
forceEraser = false;
inkCanvas.DefaultDrawingAttributes.Color = Colors.Red;
if (BtnSwitchTheme.Content.ToString() == "浅色")
if (!isLastSwitchColorByFloatBar)
{
inkCanvas.DefaultDrawingAttributes.Color = StringToColor("#FFFF3333");
BtnColorRed.Background = new SolidColorBrush(StringToColor("#FFFF3333"));
if (BtnSwitchTheme.Content.ToString() == "浅色")
{
SetDarkColors(); //在浅色背景上使用深色墨迹
}
else
{
SetLightColors(); //在深色背景上使用浅色墨迹
}
}
else
{
inkCanvas.DefaultDrawingAttributes.Color = Colors.Red;
BtnColorRed.Background = Brushes.Red;
isLastSwitchColorByFloatBar = false;
}
inkCanvas.DefaultDrawingAttributes.Color = ((SolidColorBrush)BtnColorRed.Background).Color;

ColorSwitchCheck();
}
Expand All @@ -1580,16 +1601,22 @@ private void BtnColorGreen_Click(object sender, RoutedEventArgs e)
{
inkColor = 2;
forceEraser = false;
if (BtnSwitchTheme.Content.ToString() == "浅色")
if (!isLastSwitchColorByFloatBar)
{
inkCanvas.DefaultDrawingAttributes.Color = StringToColor("#FF1ED760");
BtnColorGreen.Background = new SolidColorBrush(StringToColor("#FF1ED760"));
if (BtnSwitchTheme.Content.ToString() == "浅色")
{
SetDarkColors(); //在浅色背景上使用深色墨迹
}
else
{
SetLightColors(); //在深色背景上使用浅色墨迹
}
}
else
{
inkCanvas.DefaultDrawingAttributes.Color = StringToColor("#FF169141");
BtnColorGreen.Background = new SolidColorBrush(StringToColor("#FF169141"));
isLastSwitchColorByFloatBar = false;
}
inkCanvas.DefaultDrawingAttributes.Color = ((SolidColorBrush)BtnColorGreen.Background).Color;

ColorSwitchCheck();
}
Expand All @@ -1598,7 +1625,22 @@ private void BtnColorBlue_Click(object sender, RoutedEventArgs e)
{
inkColor = 3;
forceEraser = false;
inkCanvas.DefaultDrawingAttributes.Color = StringToColor("#FF239AD6");
if (!isLastSwitchColorByFloatBar)
{
if (BtnSwitchTheme.Content.ToString() == "浅色")
{
SetDarkColors(); //在浅色背景上使用深色墨迹
}
else
{
SetLightColors(); //在深色背景上使用浅色墨迹
}
}
else
{
isLastSwitchColorByFloatBar = false;
}
inkCanvas.DefaultDrawingAttributes.Color = ((SolidColorBrush)BtnColorBlue.Background).Color;

ColorSwitchCheck();
}
Expand All @@ -1607,16 +1649,22 @@ private void BtnColorYellow_Click(object sender, RoutedEventArgs e)
{
inkColor = 4;
forceEraser = false;
if (BtnSwitchTheme.Content.ToString() == "浅色")
if (!isLastSwitchColorByFloatBar)
{
inkCanvas.DefaultDrawingAttributes.Color = StringToColor("#FFFFC000");
BtnColorYellow.Background = new SolidColorBrush(StringToColor("#FFFFC000"));
if (BtnSwitchTheme.Content.ToString() == "浅色")
{
SetDarkColors(); //在浅色背景上使用深色墨迹
}
else
{
SetLightColors(); //在深色背景上使用浅色墨迹
}
}
else
{
inkCanvas.DefaultDrawingAttributes.Color = StringToColor("#FFF38B00");
BtnColorYellow.Background = new SolidColorBrush(StringToColor("#FFF38B00"));
isLastSwitchColorByFloatBar = false;
}
inkCanvas.DefaultDrawingAttributes.Color = ((SolidColorBrush)BtnColorYellow.Background).Color;

ColorSwitchCheck();
}
Expand Down Expand Up @@ -2901,8 +2949,8 @@ private void ComboBoxEraserSize_SelectionChanged(object sender, SelectionChanged
Settings.Canvas.EraserSize = ComboBoxEraserSize.SelectedIndex;
SaveSettingsToFile();
}


private void ComboBoxEraserType_OnSelectionChanged(object sender, SelectionChangedEventArgs e)
{
if (!isLoaded) return;
Expand Down Expand Up @@ -5908,6 +5956,52 @@ private void UpdateIndexInfoDisplay()
}
}

private void SetLightColors()
{
if (File.Exists(App.RootPath + "Colors\\Light.ini"))
{
try
{
string[] lightColors = File.ReadAllLines(App.RootPath + "Colors\\Light.ini");
BtnColorRed.Background = new SolidColorBrush(StringToColor(lightColors[0]));
BtnColorGreen.Background = new SolidColorBrush(StringToColor(lightColors[1]));
BtnColorBlue.Background = new SolidColorBrush(StringToColor(lightColors[2]));
BtnColorYellow.Background = new SolidColorBrush(StringToColor(lightColors[3]));
}
catch (Exception) { ShowNotification("读取亮色画笔颜色配置文件时遇到问题"); }
}
else
{
BtnColorRed.Background = new SolidColorBrush(StringToColor("#FFFF3333"));
BtnColorGreen.Background = new SolidColorBrush(StringToColor("#FF1ED760"));
BtnColorBlue.Background = new SolidColorBrush(StringToColor("#FF239AD6"));
BtnColorYellow.Background = new SolidColorBrush(StringToColor("#FFFFC000"));
}
}

private void SetDarkColors()
{
if (File.Exists(App.RootPath + "Colors\\Dark.ini"))
{
try
{
string[] darkColors = File.ReadAllLines(App.RootPath + "Colors\\Dark.ini");
BtnColorRed.Background = new SolidColorBrush(StringToColor(darkColors[0]));
BtnColorGreen.Background = new SolidColorBrush(StringToColor(darkColors[1]));
BtnColorBlue.Background = new SolidColorBrush(StringToColor(darkColors[2]));
BtnColorYellow.Background = new SolidColorBrush(StringToColor(darkColors[3]));
}
catch (Exception) { ShowNotification("读取深色画笔颜色配置文件时遇到问题"); }
}
else
{
BtnColorRed.Background = new SolidColorBrush(Colors.Red);
BtnColorGreen.Background = new SolidColorBrush(StringToColor("#FF169141"));
BtnColorBlue.Background = new SolidColorBrush(StringToColor("#FF239AD6"));
BtnColorYellow.Background = new SolidColorBrush(StringToColor("#FFF38B00"));
}
}

#endregion Whiteboard Controls

#region Simulate Pen Pressure & Ink To Shape
Expand Down Expand Up @@ -6875,6 +6969,8 @@ private void HideSubPanels()
BorderTools.Visibility = Visibility.Collapsed;
}

bool isLastSwitchColorByFloatBar = false;

private void BorderPenColorBlack_MouseUp(object sender, MouseButtonEventArgs e)
{
BtnColorBlack_Click(BtnColorBlack, null);
Expand All @@ -6883,24 +6979,28 @@ private void BorderPenColorBlack_MouseUp(object sender, MouseButtonEventArgs e)

private void BorderPenColorRed_MouseUp(object sender, MouseButtonEventArgs e)
{
isLastSwitchColorByFloatBar = true;
BtnColorRed_Click(BtnColorRed, null);
HideSubPanels();
}

private void BorderPenColorGreen_MouseUp(object sender, MouseButtonEventArgs e)
{
isLastSwitchColorByFloatBar = true;
BtnColorGreen_Click(BtnColorGreen, null);
HideSubPanels();
}

private void BorderPenColorBlue_MouseUp(object sender, MouseButtonEventArgs e)
{
isLastSwitchColorByFloatBar = true;
BtnColorBlue_Click(BtnColorBlue, null);
HideSubPanels();
}

private void BorderPenColorYellow_MouseUp(object sender, MouseButtonEventArgs e)
{
isLastSwitchColorByFloatBar = true;
BtnColorYellow_Click(BtnColorYellow, null);
HideSubPanels();
}
Expand Down Expand Up @@ -6944,6 +7044,8 @@ private async void SymbolIconCursor_Click(object sender, RoutedEventArgs e)
}
}
}

SetDarkColors();
}

private void SymbolIconDelete_MouseUp(object sender, MouseButtonEventArgs e)
Expand Down Expand Up @@ -7034,6 +7136,9 @@ private void ImageBlackboard_MouseUp(object sender, MouseButtonEventArgs e)
{
BorderPenColorWhite_MouseUp(BorderPenColorWhite, null);
}

if (Settings.Canvas.UsingWhiteboard) SetDarkColors(); //在白板上用深色墨迹
else SetLightColors(); //在黑板上用浅色墨迹
}
else
{
Expand All @@ -7060,6 +7165,8 @@ private void ImageBlackboard_MouseUp(object sender, MouseButtonEventArgs e)
})).Start();
}
BorderPenColorRed_MouseUp(BorderPenColorRed, null);

SetDarkColors();
}

BtnSwitch_Click(BtnSwitch, null);
Expand Down
Loading