diff --git a/Ink Canvas/Resources/Settings.cs b/Ink Canvas/Resources/Settings.cs index 86f60ff7..6010ccbd 100644 --- a/Ink Canvas/Resources/Settings.cs +++ b/Ink Canvas/Resources/Settings.cs @@ -56,6 +56,9 @@ public class Settings [JsonProperty("notification")] public NotificationSettings Notification { get; set; } = new NotificationSettings(); + [JsonProperty("timer")] + public TimerSettings Timer { get; set; } = new TimerSettings(); + [JsonProperty("toolbar")] public ToolbarLayoutSettings Toolbar { get; set; } = new ToolbarLayoutSettings(); @@ -300,6 +303,12 @@ public class NotificationSettings public bool IsDictationDoNotDisturbInWhiteboardEnabled { get; set; } = true; } + public class TimerSettings + { + [JsonProperty("isOpenTransparency")] + public bool IsOpenTransparency { get; set; } = true; + } + public class Security { [JsonProperty("passwordEnabled")] diff --git a/Ink Canvas/Windows/NewStyleMinimizedTimerWindow.xaml b/Ink Canvas/Windows/NewStyleMinimizedTimerWindow.xaml index 0f5cee48..2c1e001e 100644 --- a/Ink Canvas/Windows/NewStyleMinimizedTimerWindow.xaml +++ b/Ink Canvas/Windows/NewStyleMinimizedTimerWindow.xaml @@ -32,6 +32,7 @@ Background="Transparent" BorderThickness="0" Click="CloseButton_Click" Cursor="Hand" Opacity="0.7"> + @@ -50,6 +51,32 @@ HorizontalAlignment="Center" VerticalAlignment="Center"/> + + + diff --git a/Ink Canvas/Windows/NewStyleMinimizedTimerWindow.xaml.cs b/Ink Canvas/Windows/NewStyleMinimizedTimerWindow.xaml.cs index 884d0ee4..1e957521 100644 --- a/Ink Canvas/Windows/NewStyleMinimizedTimerWindow.xaml.cs +++ b/Ink Canvas/Windows/NewStyleMinimizedTimerWindow.xaml.cs @@ -1,3 +1,5 @@ +using Ink_Canvas.Windows.SettingsViews.Helpers; +using iNKORE.UI.WPF.Modern; using System; using System.Timers; using System.Windows; @@ -30,6 +32,12 @@ public NewStyleMinimizedTimerWindow( Action stopTimerCallback) { InitializeComponent(); + if (!SettingsManager.Settings.Timer.IsOpenTransparency) + { + MainBorder.Background = new SolidColorBrush( + Color.FromArgb(255, 249, 249, 249) + ); + } _getRemainingTime = remainingTime; _shouldHide = shouldHide; _restoreCallback = restoreCallback; @@ -152,5 +160,23 @@ private void CloseButton_Click(object sender, RoutedEventArgs e) _stopTimerCallback?.Invoke(); Close(); } + + private void ToggleTransparency_Click(object sender, RoutedEventArgs e) + { + if(SettingsManager.Settings.Timer.IsOpenTransparency) + { + MainBorder.Background = new SolidColorBrush( + Color.FromArgb(255, 249, 249, 249)//完全不透明 + ); + SettingsManager.Settings.Timer.IsOpenTransparency = false; + SettingsManager.SaveSettingsToFile(); + } + else + { + MainBorder.Background = (Brush)FindResource(ThemeKeys.CardBackgroundFillColorDefaultBrushKey);//还原 + SettingsManager.Settings.Timer.IsOpenTransparency = true; + SettingsManager.SaveSettingsToFile(); + } + } } }