kriastans/InkCanvasForClass
kriastans/InkCanvasForClass
1
Fork 0
Code Issues 1 Actions Projects 1 Releases Wiki Activity

Fix bugs and optimize code

Browse Source
This commit is contained in:
XY Wang 2023-05-29 12:35:52 +08:00 committed by GitHub
parent 15ecc9fa0d
commit d83a96c0ad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Ink Canvas/MainWindow.xaml.cs
View File

@ -1,4 +1,4 @@
using Ink_Canvas.Helpers; using Ink_Canvas.Helpers;
using IWshRuntimeLibrary; using IWshRuntimeLibrary;
using Microsoft.Office.Interop.PowerPoint; using Microsoft.Office.Interop.PowerPoint;
using Microsoft.VisualBasic; using Microsoft.VisualBasic;
@ -85,7 +85,6 @@ namespace Ink_Canvas
inkCanvas.Strokes.StrokesChanged += StrokesOnStrokesChanged; inkCanvas.Strokes.StrokesChanged += StrokesOnStrokesChanged;
Microsoft.Win32.SystemEvents.UserPreferenceChanged += SystemEvents_UserPreferenceChanged; Microsoft.Win32.SystemEvents.UserPreferenceChanged += SystemEvents_UserPreferenceChanged;
SystemEvents_UserPreferenceChanged(null, null);
} }
#endregion #endregion
@ -517,6 +516,7 @@ namespace Ink_Canvas
} }
ThemeManager.Current.ApplicationTheme = ApplicationTheme.Light; ThemeManager.Current.ApplicationTheme = ApplicationTheme.Light;
SystemEvents_UserPreferenceChanged(null, null);
TextBlockVersion.Text = Assembly.GetExecutingAssembly().GetName().Version.ToString(); TextBlockVersion.Text = Assembly.GetExecutingAssembly().GetName().Version.ToString();
LogHelper.WriteLogToFile("Ink Canvas Loaded", LogHelper.LogType.Event); LogHelper.WriteLogToFile("Ink Canvas Loaded", LogHelper.LogType.Event);
@ -6396,7 +6396,8 @@ namespace Ink_Canvas
} }
#endregion #endregion
#region AutoDarkLightTheme #region Auto Theme
Color toolBarForegroundColor = Color.FromRgb(102, 102, 102); Color toolBarForegroundColor = Color.FromRgb(102, 102, 102);
private void SetTheme(string theme) private void SetTheme(string theme)
{ {
@ -6416,7 +6417,7 @@ namespace Ink_Canvas
ThemeManager.SetRequestedTheme(window, ElementTheme.Light); ThemeManager.SetRequestedTheme(window, ElementTheme.Light);
toolBarForegroundColor = Color.FromRgb(102, 102, 102); toolBarForegroundColor = (Color)Application.Current.FindResource("ToolBarForegroundColor");
} }
else if (theme == "Dark") else if (theme == "Dark")
{ {
@ -6434,12 +6435,13 @@ namespace Ink_Canvas
ThemeManager.SetRequestedTheme(window, ElementTheme.Dark); ThemeManager.SetRequestedTheme(window, ElementTheme.Dark);
toolBarForegroundColor = Color.FromRgb(204, 204, 204); toolBarForegroundColor = (Color)Application.Current.FindResource("ToolBarForegroundColor");
} }
SymbolIconSelect.Foreground = new SolidColorBrush(toolBarForegroundColor); SymbolIconSelect.Foreground = new SolidColorBrush(toolBarForegroundColor);
SymbolIconDelete.Foreground = new SolidColorBrush(toolBarForegroundColor); SymbolIconDelete.Foreground = new SolidColorBrush(toolBarForegroundColor);
} }
private void SystemEvents_UserPreferenceChanged(object sender, Microsoft.Win32.UserPreferenceChangedEventArgs e) private void SystemEvents_UserPreferenceChanged(object sender, Microsoft.Win32.UserPreferenceChangedEventArgs e)
{ {
switch (Settings.Appearance.Theme) switch (Settings.Appearance.Theme)
@ -6456,6 +6458,7 @@ namespace Ink_Canvas
break; break;
} }
} }
private bool IsSystemThemeLight() private bool IsSystemThemeLight()
{ {
bool light = false; bool light = false;