[UI fix] FloatBarTitle Margin, IsAutoUpdateWithSilenceBlock Visibilit…

…y, BorderHighlighterColorPurple
ChangSakura · Jul 9, 2024 · b31aea8 · b31aea8
1 parent cd59417
commit b31aea8
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 29 deletions.
diff --git a/Ink Canvas/Helpers/EdgeGestureUtil.cs b/Ink Canvas/Helpers/EdgeGestureUtil.cs
@@ -1,17 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Microsoft.VisualBasic;
-using System.Collections;
-using System.Data;
-using System.Diagnostics;
 using System.Runtime.InteropServices;
 using System.Runtime.CompilerServices;
 

diff --git a/Ink Canvas/MainWindow.xaml b/Ink Canvas/MainWindow.xaml
@@ -389,7 +389,7 @@
                                     <ui:SimpleStackPanel>
                                         <Border Background="{DynamicResource BoardBarTitleBackground}"
                                                 BorderBrush="{DynamicResource BoardBarBorderBrush}" BorderThickness="1"
-                                                CornerRadius="5,5,0,0" Margin="-1 -1 0 0" Padding="15,5">
+                                                CornerRadius="5,5,0,0" Margin="-1 -1 -1 0" Padding="15,5">
                                             <TextBlock Text="手势功能" Foreground="{DynamicResource BoardBarForeground}"
                                                        FontSize="11" FontWeight="Bold" TextAlignment="Left" />
                                         </Border>
@@ -520,7 +520,7 @@
                                     <ui:SimpleStackPanel>
                                         <Border Background="{DynamicResource BoardBarTitleBackground}"
                                                 BorderBrush="{DynamicResource BoardBarBorderBrush}" BorderThickness="1"
-                                                CornerRadius="5,5,0,0" Margin="-1 -1 0 0" Padding="15,5">
+                                                CornerRadius="5,5,0,0" Margin="-1 -1 -1 0" Padding="15,5">
                                             <TextBlock Text="墨迹选项" Foreground="{DynamicResource BoardBarForeground}"
                                                        FontWeight="Bold" />
                                         </Border>
@@ -885,7 +885,7 @@
                                                                         </Viewbox>
                                                                     </Border>
                                                                     <Border x:Name="BoardBorderHighlighterColorPurple"
-                                                                            Background="#ff86f6"
+                                                                            Background="#9333ea"
                                                                             BorderBrush="{DynamicResource BoardBarBorderBrush}"
                                                                             BorderThickness="1" CornerRadius="4"
                                                                             Width="30"
@@ -991,7 +991,7 @@
                                 <ui:SimpleStackPanel Orientation="Vertical">
                                     <Border Background="{DynamicResource BoardBarTitleBackground}"
                                             BorderBrush="{DynamicResource BoardBarBorderBrush}" BorderThickness="1"
-                                            CornerRadius="5,5,0,0" Margin="-1 -1 0 0" Padding="15,5,0,5">
+                                            CornerRadius="5,5,0,0" Margin="-1 -1 -1 0" Padding="15,5,0,5">
                                         <ui:SimpleStackPanel Orientation="Horizontal">
                                             <TextBlock Text="图形(第一行支持长按保持选中)" FontSize="14"
                                                        Foreground="{DynamicResource BoardBarForeground}"
@@ -1161,7 +1161,7 @@
                                     <ui:SimpleStackPanel>
                                         <Border Background="{DynamicResource BoardBarTitleBackground}"
                                                 BorderBrush="{DynamicResource BoardBarBorderBrush}" BorderThickness="1"
-                                                CornerRadius="5,5,0,0" Margin="-1 -1 0 0" Padding="15,5">
+                                                CornerRadius="5,5,0,0" Margin="-1 -1 -1 0" Padding="15,5">
                                             <TextBlock Text="更多功能" FontSize="16"
                                                        Foreground="{DynamicResource BoardBarForeground}"
                                                        FontWeight="Bold" />
@@ -1599,14 +1599,14 @@
                                             Foreground="#666666" />
                                     </ui:SimpleStackPanel>
                                 </Border>
-                                <ui:SimpleStackPanel Orientation="Horizontal">
+                                <ui:SimpleStackPanel x:Name="IsAutoUpdateWithSilenceBlock" Orientation="Horizontal">
                                     <TextBlock Text="静默更新" VerticalAlignment="Center" FontSize="14" Margin="0,0,14,0" />
                                     <ui:ToggleSwitch Name="ToggleSwitchIsAutoUpdateWithSilence" OnContent="开"
                                                      OffContent="关"
                                                      Toggled="ToggleSwitchIsAutoUpdateWithSilence_Toggled" />
                                 </ui:SimpleStackPanel>
                                 <Border BorderBrush="Black" BorderThickness="1" CornerRadius="5" Padding="12"
-                                        Visibility="{Binding ElementName=ToggleSwitchIsAutoUpdateWithSilence, Path=Visibility}">
+                                        Visibility="{Binding ElementName=IsAutoUpdateWithSilenceBlock, Path=Visibility}">
                                     <ui:SimpleStackPanel Spacing="12">
                                         <TextBlock
                                             Text="# 关闭静默更新后，已完成安装包的下载后将会弹窗询问是否进行更新，开启静默更新后将会在安装包下载完成后每隔十分钟进行如下检测：①处于静默更新时间段内 ②未处于书写模式 ③未处于画板内。若以上检测通过即会关闭软件进行自动更新。"
@@ -2695,7 +2695,7 @@
                                     <ui:SimpleStackPanel>
                                         <Border Background="{DynamicResource FloatBarTitleBackground}"
                                                 BorderBrush="{DynamicResource FloatBarBorderBrush}" BorderThickness="1"
-                                                CornerRadius="5,5,0,0" Margin="-1 -1 0 0" Padding="15,5">
+                                                CornerRadius="5,5,0,0" Margin="-1 -1 -1 0" Padding="15,5">
                                             <TextBlock Text="墨迹选项" Foreground="{DynamicResource FloatBarForeground}"
                                                        FontWeight="Bold" />
                                         </Border>
@@ -3052,7 +3052,7 @@
                                                                     </Viewbox>
                                                                 </Border>
                                                                 <Border x:Name="BorderHighlighterColorPurple"
-                                                                        Background="#ff86f6"
+                                                                        Background="#9333ea"
                                                                         BorderBrush="{DynamicResource FloatBarBorderBrush}"
                                                                         BorderThickness="1" CornerRadius="4" Width="30"
                                                                         MouseUp="BtnHighlighterColorPurple_Click">
@@ -3138,7 +3138,7 @@
                                     <ui:SimpleStackPanel Orientation="Vertical">
                                         <Border Background="{DynamicResource FloatBarTitleBackground}"
                                                 BorderBrush="{DynamicResource FloatBarBorderBrush}" BorderThickness="1"
-                                                CornerRadius="5,5,0,0" Margin="-1 -1 0 0" Padding="15,5,0,5">
+                                                CornerRadius="5,5,0,0" Margin="-1 -1 -1 0" Padding="15,5,0,5">
                                             <ui:SimpleStackPanel Orientation="Horizontal">
                                                 <TextBlock Text="图形(第一行支持长按保持选中)" FontSize="10"
                                                            Foreground="{DynamicResource FloatBarForeground}"
@@ -3356,7 +3356,7 @@
                                     <ui:SimpleStackPanel>
                                         <Border Background="{DynamicResource FloatBarTitleBackground}"
                                                 BorderBrush="{DynamicResource FloatBarBorderBrush}" BorderThickness="1"
-                                                CornerRadius="5,5,0,0" Margin="-1 -1 0 0" Padding="15,5">
+                                                CornerRadius="5,5,0,0" Margin="-1 -1 -1 0" Padding="15,5">
                                             <TextBlock Text="更多设置" Foreground="{DynamicResource FloatBarForeground}"
                                                        FontWeight="Bold" />
                                         </Border>
@@ -3496,7 +3496,7 @@
                         <ui:SimpleStackPanel>
                             <Border Background="{DynamicResource FloatBarTitleBackground}"
                                     BorderBrush="{DynamicResource FloatBarBorderBrush}" BorderThickness="1"
-                                    CornerRadius="5,5,0,0" Margin="-1 -1 0 0" Padding="15,5">
+                                    CornerRadius="5,5,0,0" Margin="-1 -1 -1 0" Padding="15,5">
                                 <TextBlock Text="手势选项" FontSize="10" Foreground="{DynamicResource FloatBarForeground}"
                                            FontWeight="Bold" />
                             </Border>

diff --git a/Ink Canvas/MainWindow_cs/MW_Settings.cs b/Ink Canvas/MainWindow_cs/MW_Settings.cs
@@ -17,7 +17,7 @@ public partial class MainWindow : Window {
         private void ToggleSwitchIsAutoUpdate_Toggled(object sender, RoutedEventArgs e) {
             if (!isLoaded) return;
             Settings.Startup.IsAutoUpdate = ToggleSwitchIsAutoUpdate.IsOn;
-            ToggleSwitchIsAutoUpdateWithSilence.Visibility = ToggleSwitchIsAutoUpdate.IsOn ? Visibility.Visible : Visibility.Collapsed;
+            IsAutoUpdateWithSilenceBlock.Visibility = ToggleSwitchIsAutoUpdate.IsOn ? Visibility.Visible : Visibility.Collapsed;
             SaveSettingsToFile();
         }
         private void ToggleSwitchIsAutoUpdateWithSilence_Toggled(object sender, RoutedEventArgs e) {

diff --git a/Ink Canvas/MainWindow_cs/MW_SettingsToLoad.cs b/Ink Canvas/MainWindow_cs/MW_SettingsToLoad.cs
@@ -64,7 +64,7 @@ private void LoadSettings(bool isStartup = false) {
                 ToggleSwitchIsAutoUpdateWithProxy.IsOn = Settings.Startup.IsAutoUpdateWithProxy;
                 AutoUpdateWithProxy_Title.Visibility = Settings.Startup.IsAutoUpdateWithProxy ? Visibility.Visible : Visibility.Collapsed;
                 AutoUpdateProxyTextBox.Text = Settings.Startup.AutoUpdateProxy;
-                ToggleSwitchIsAutoUpdateWithSilence.Visibility = Settings.Startup.IsAutoUpdate ? Visibility.Visible : Visibility.Collapsed;
+                IsAutoUpdateWithSilenceBlock.Visibility = Settings.Startup.IsAutoUpdate ? Visibility.Visible : Visibility.Collapsed;
                 if (Settings.Startup.IsAutoUpdateWithSilence) {
                     ToggleSwitchIsAutoUpdateWithSilence.IsOn = true;
                 }

diff --git a/Ink Canvas/Properties/AssemblyInfo.cs b/Ink Canvas/Properties/AssemblyInfo.cs
@@ -49,5 +49,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("4.7.3.0")]
-[assembly: AssemblyFileVersion("4.7.3.0")]
+[assembly: AssemblyVersion("5.0.0.0")]
+[assembly: AssemblyFileVersion("5.0.0.0")]