From e149139f2097bd3c8e6ce615fed91c503694036b Mon Sep 17 00:00:00 2001
From: STBBRD <62409850+STBBRD@users.noreply.github.com>
Date: Sun, 13 Oct 2024 13:08:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E5=AE=9A=E7=A8=8B=E5=BA=A6=E4=B8=8A?=
 =?UTF-8?q?=E9=81=BF=E5=85=8D=E4=B8=8A=E4=B8=8B=E8=AF=BE=E9=80=9A=E7=9F=A5?=
 =?UTF-8?q?=E6=9C=AA=E5=93=8D=E5=BA=94=20#30=20=EF=BC=88=E9=9C=80=E8=A6=81?=
 =?UTF-8?q?=E7=AD=89=E6=88=91=E5=88=B0=E6=95=99=E5=AE=A4=E9=87=8C=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95=EF=BC=8C=E5=9C=A8=E6=88=91=E7=94=B5=E8=84=91=E4=B8=8A?=
 =?UTF-8?q?=E6=B2=A1=E5=87=BA=E7=8E=B0=E8=BF=87=E6=9C=AA=E5=93=8D=E5=BA=94?=
 =?UTF-8?q?=EF=BC=89=EF=BC=8C=E4=BC=98=E5=8C=96=E9=A2=9C=E8=89=B2=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E9=9D=A2=E6=9D=BF=E5=8A=A8=E7=94=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MainWindow.xaml.cs                         |  2 +-
 .../TimetableNotificationWindow.xaml           |  2 +-
 .../TimetableNotificationWindow.xaml.cs        | 18 +++++++-----------
 3 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/ZongziTEK_Blackboard_Sticker/MainWindow.xaml.cs b/ZongziTEK_Blackboard_Sticker/MainWindow.xaml.cs
index 7ebbbb5..2ddcca6 100644
--- a/ZongziTEK_Blackboard_Sticker/MainWindow.xaml.cs
+++ b/ZongziTEK_Blackboard_Sticker/MainWindow.xaml.cs
@@ -342,7 +342,7 @@ private void CheckIsBlackboardLocked()
 
                 if (GetIsLightTheme()) ToggleButtonLock.Foreground = new SolidColorBrush(Colors.White); else ToggleButtonLock.Foreground = new SolidColorBrush(Colors.Black);
 
-                eraserButton.Visibility = Visibility.Collapsed;
+                eraserButton.Visibility = Visibility.Hidden;
                 HideColorPicker();
 
             }
diff --git a/ZongziTEK_Blackboard_Sticker/TimetableNotificationWindow.xaml b/ZongziTEK_Blackboard_Sticker/TimetableNotificationWindow.xaml
index e0f6e7b..2c2db05 100644
--- a/ZongziTEK_Blackboard_Sticker/TimetableNotificationWindow.xaml
+++ b/ZongziTEK_Blackboard_Sticker/TimetableNotificationWindow.xaml
@@ -6,7 +6,7 @@
         xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern" xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
         xmlns:local="clr-namespace:ZongziTEK_Blackboard_Sticker"
         mc:Ignorable="d"
-        Title="ZongziTEK 黑板贴 - 通知" d:Height="900" d:Width="1600" WindowStyle="None" WindowState="Maximized" AllowsTransparency="True" Background="{x:Null}" Topmost="True" ShowInTaskbar="False"
+        Title="ZongziTEK 黑板贴 - 通知" Height="192" d:Width="1600" Top="0" Left="0" WindowStyle="None" AllowsTransparency="True" Background="#00000000" Topmost="True" ShowInTaskbar="False"
         Loaded="Window_Loaded" Closing="Window_Closing">
     <Grid Name="GridNotification">
         <Border x:Name="border" Height="{Binding ActualHeight, ElementName=BorderNotification, Mode=OneWay}" 
diff --git a/ZongziTEK_Blackboard_Sticker/TimetableNotificationWindow.xaml.cs b/ZongziTEK_Blackboard_Sticker/TimetableNotificationWindow.xaml.cs
index 24e3787..b599389 100644
--- a/ZongziTEK_Blackboard_Sticker/TimetableNotificationWindow.xaml.cs
+++ b/ZongziTEK_Blackboard_Sticker/TimetableNotificationWindow.xaml.cs
@@ -27,6 +27,8 @@ public TimetableNotificationWindow(string title, string subtitle, double time, b
         {
             InitializeComponent();
 
+            Width = SystemParameters.WorkArea.Width;
+
             totalTime = TimeSpan.FromSeconds(time);
             timeLeft = totalTime;
             timeToHide = DateTime.Now.TimeOfDay + timeLeft;
@@ -41,17 +43,11 @@ public TimetableNotificationWindow(string title, string subtitle, double time, b
 
             if (!isTextTimeVisible)
             {
-                TextTime.Visibility = Visibility.Collapsed;
+                TextTime.Visibility = Visibility.Hidden;
                 isTimeHidden = true;
             }
-        }
-
-        protected override void OnSourceInitialized(EventArgs e)
-        {
-            base.OnSourceInitialized(e);
 
-            var hwnd = new WindowInteropHelper(this).Handle;
-            WindowsHelper.SetWindowStyleToolWindow(hwnd);
+            TextTime.Text = (timeLeft.TotalSeconds - 1).ToString("00");
         }
 
         private TimeSpan totalTime;
@@ -62,7 +58,7 @@ protected override void OnSourceInitialized(EventArgs e)
 
         private void Window_Loaded(object sender, RoutedEventArgs e)
         {
-            Timer_Tick(null, null);
+            //Timer_Tick(null, null);
             ShowNotification();
 
             DoubleAnimation barWidthAnimation = new()
@@ -90,11 +86,11 @@ private void Timer_Tick(object sender, EventArgs e)
             timeLeft = timeToHide - DateTime.Now.TimeOfDay;
             TextTime.Text = timeLeft.TotalSeconds.ToString("00");
 
-            if (Convert.ToInt32(TextTime.Text) == 1)
+            if (timeLeft.TotalSeconds == 1)
             {
                 if (!isTimeHidden) HideTime();
             }
-            else if (Convert.ToInt32(TextTime.Text) <= 0)
+            else if (timeLeft.TotalSeconds <= 0)
             {
                 if (!isNotificationHidden) HideNotification();
             }