From ece8787b8e3b9410f8d981a5d7f3b922adbb232b Mon Sep 17 00:00:00 2001
From: BookerLiu <booker_liu@163.com>
Date: Fri, 21 Apr 2023 22:33:05 +0800
Subject: [PATCH] =?UTF-8?q?:sparkles:=20=E4=BC=98=E5=8C=96UI,=20=E6=8F=90?=
 =?UTF-8?q?=E5=8F=96=E5=85=AC=E5=85=B1=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Control/Other/BacklogNotificatin.xaml         |  2 +-
 Control/Other/CustomIconUrlDialog.xaml        |  4 ++--
 Control/Other/IconInfoDialog.xaml             |  4 ++--
 Control/Other/IconInfoUrlDialog.xaml          | 10 ++++----
 Control/Other/PasswordDialog.xaml             |  2 +-
 .../UserControls/Config/MotionControl.xaml    | 23 +++++++------------
 .../PannelCard/LeftCardControl.xaml           |  2 +-
 Control/Windows/IconfontWindow.xaml           |  2 +-
 Control/Windows/ToDoInfoWindow.xaml           | 13 +++++++----
 MainWindow.xaml                               |  1 +
 Resource/Dictionary/CommonStyle.xaml          | 16 +++++++++++++
 11 files changed, 47 insertions(+), 32 deletions(-)

diff --git a/Control/Other/BacklogNotificatin.xaml b/Control/Other/BacklogNotificatin.xaml
index 76c46ce..30e7db7 100644
--- a/Control/Other/BacklogNotificatin.xaml
+++ b/Control/Other/BacklogNotificatin.xaml
@@ -37,7 +37,7 @@
         </hc:Card>
 
         <hc:UniformSpacingPanel Spacing="20" HorizontalAlignment="Center" Margin="45.5,310,42.5,36">
-            <hc:TextBox x:Name="DelayTime" Height="20" Width="60" Text="10" PreviewTextInput="DelayTime_PreviewTextInput" PreviewLostKeyboardFocus="DelayTime_PreviewLostKeyboardFocus" />
+            <hc:TextBox x:Name="DelayTime" Style="{StaticResource MyTextBoxStyle}" Height="20" Width="60" Text="10" PreviewTextInput="DelayTime_PreviewTextInput" PreviewLostKeyboardFocus="DelayTime_PreviewLostKeyboardFocus" />
             <ComboBox x:Name="DelayType" hc:DropDownElement.ConsistentWidth="False" SelectedIndex="0" Height="20" Width="60">
                 <ComboBox.Items>
                     <ComboBoxItem Content="分"/>
diff --git a/Control/Other/CustomIconUrlDialog.xaml b/Control/Other/CustomIconUrlDialog.xaml
index be20eca..e384a0e 100644
--- a/Control/Other/CustomIconUrlDialog.xaml
+++ b/Control/Other/CustomIconUrlDialog.xaml
@@ -23,7 +23,7 @@
                     <TextBlock Text="SVG 图标地址:"  Style="{StaticResource LeftTB}"/>
                     <TextBlock Text="*" Foreground="Red"/>
                 </WrapPanel>
-                <TextBox x:Name="IconUrl" Text="{Binding CustomIconUrl, Mode=OneWay}" Width="240" FontSize="14"/>
+                <TextBox x:Name="IconUrl" Style="{StaticResource MyTextBoxStyle}" Text="{Binding CustomIconUrl, Mode=OneWay}" Width="240" FontSize="14"/>
             </hc:UniformSpacingPanel>
 
             <hc:UniformSpacingPanel Spacing="10" Margin="0,58.276,0,-58.276">
@@ -31,7 +31,7 @@
                     <TextBlock Text="JSON 配置地址:"  Style="{StaticResource LeftTB}"/>
                     <TextBlock Text="*" Foreground="Red"/>
                 </WrapPanel>
-                <TextBox x:Name="JsonUrl" Text="{Binding CustomIconJsonUrl, Mode=OneWay}" Width="240" FontSize="14"/>
+                <TextBox x:Name="JsonUrl" Style="{StaticResource MyTextBoxStyle}" Text="{Binding CustomIconJsonUrl, Mode=OneWay}" Width="240" FontSize="14"/>
             </hc:UniformSpacingPanel>
             <TextBlock Text="注: 需配置正确的url方可加载远程图标!" Foreground="Red" Margin="10,95,-10,-92" />
 
diff --git a/Control/Other/IconInfoDialog.xaml b/Control/Other/IconInfoDialog.xaml
index e4165c4..5b00a37 100644
--- a/Control/Other/IconInfoDialog.xaml
+++ b/Control/Other/IconInfoDialog.xaml
@@ -24,7 +24,7 @@
             <Button Width="22"  Height="22" Command="hc:ControlCommands.Close" Style="{StaticResource ButtonIcon}" Foreground="{DynamicResource {x:Static SystemColors.ControlDarkDarkBrushKey}}" hc:IconElement.Geometry="{StaticResource ErrorGeometry}" Padding="0" HorizontalAlignment="Right" VerticalAlignment="Top"/>
             <hc:UniformSpacingPanel Spacing="10" Margin="0,15,0,0">
                 <TextBlock Text="名称:"  Style="{StaticResource LeftTB}"/>
-                <TextBox x:Name="IconName" Text="{Binding Name, Mode=OneWay}" Width="230" FontSize="14"/>
+                <TextBox x:Name="IconName" Style="{StaticResource MyTextBoxStyle}" Text="{Binding Name, Mode=OneWay}" Width="230" FontSize="14"/>
             </hc:UniformSpacingPanel>
             <hc:UniformSpacingPanel Spacing="10" Margin="0,15,0,0">
                 <TextBlock Text="相对路径:"  Style="{StaticResource LeftTB}"/>
@@ -49,7 +49,7 @@
             </hc:UniformSpacingPanel>
             <hc:UniformSpacingPanel Spacing="10" Margin="0,15,0,0">
                 <TextBlock Text="启动参数:"  Style="{StaticResource LeftTB}"/>
-                <TextBox x:Name="StartArg" Text="{Binding StartArg, Mode=OneWay}" Width="230" Height="100" TextWrapping="Wrap" FontSize="14"/>
+                <TextBox x:Name="StartArg" Style="{StaticResource MyTextBoxStyle}" Text="{Binding StartArg, Mode=OneWay}" Width="230" Height="100" TextWrapping="Wrap" FontSize="14"/>
             </hc:UniformSpacingPanel>
             <hc:UniformSpacingPanel Margin="0,25,0,0" Spacing="10"  Grid.ColumnSpan="4">
                 <Button Content="保存" Style="{StaticResource MyBtnStyle}" Click="SaveProperty" Margin="265,10,0,0"/>
diff --git a/Control/Other/IconInfoUrlDialog.xaml b/Control/Other/IconInfoUrlDialog.xaml
index e585641..b2939c3 100644
--- a/Control/Other/IconInfoUrlDialog.xaml
+++ b/Control/Other/IconInfoUrlDialog.xaml
@@ -23,23 +23,23 @@
             
             <hc:UniformSpacingPanel Spacing="10" VerticalAlignment="Center">
                 <TextBlock Text="名称:"  Style="{StaticResource LeftTB}"/>
-                <TextBox x:Name="IconName" Text="{Binding Name, Mode=OneWay}" Width="180" FontSize="14"/>
+                <TextBox x:Name="IconName" Style="{StaticResource MyTextBoxStyle}" Text="{Binding Name, Mode=OneWay}" Width="180" FontSize="14"/>
             </hc:UniformSpacingPanel>
             <hc:Divider LineStrokeDashArray="3,3"  LineStroke="Black"/>
             <hc:UniformSpacingPanel Spacing="10"  VerticalAlignment="Center">
                 <TextBlock  Text="Url:"  Style="{StaticResource LeftTB}"/>
-                <TextBox x:Name="IconUrl" Text="{Binding Path, Mode=OneWay}"  Width="180" FontSize="14"/>
+                <TextBox x:Name="IconUrl" Style="{StaticResource MyTextBoxStyle}" Text="{Binding Path, Mode=OneWay}"  Width="180" FontSize="14"/>
             </hc:UniformSpacingPanel>
             <hc:Divider LineStrokeDashArray="3,3" LineStroke="Black"/>
             <hc:UniformSpacingPanel Spacing="10"  VerticalAlignment="Center">
                 <TextBlock  Text="图标:"  Style="{StaticResource LeftTB}"/>
                 <Image x:Name="IconImg" Source="{Binding BitmapImage, Mode=OneWay}" RenderOptions.BitmapScalingMode="HighQuality" Width="60" Height="60"/>
-                <Button Content="修改" Click="EditImage"/>
-                <Button Content="重置" Click="ReStoreImage"/>
+                <Button Style="{StaticResource MyBtnStyle}" Content="修改" Click="EditImage"/>
+                <Button Style="{StaticResource MyBtnStyle}" Content="重置" Click="ReStoreImage"/>
             </hc:UniformSpacingPanel>
             <hc:Divider LineStrokeDashArray="3,3" LineStroke="Black"/>
             <hc:UniformSpacingPanel Spacing="10">
-                <Button Content="保存" Click="SaveProperty" Style="{StaticResource Btn1}" Margin="224,-10,-224,0" />
+                <Button Content="保存" Click="SaveProperty" Style="{StaticResource MyBtnStyle}" Margin="224,-10,-224,0" />
             </hc:UniformSpacingPanel>
         </StackPanel>
     </hc:SimplePanel>
diff --git a/Control/Other/PasswordDialog.xaml b/Control/Other/PasswordDialog.xaml
index 39dca05..3813ba0 100644
--- a/Control/Other/PasswordDialog.xaml
+++ b/Control/Other/PasswordDialog.xaml
@@ -64,7 +64,7 @@
         </Grid>
         <Grid Height="65" x:Name="HintGrid" Visibility="Collapsed" Margin="0,20,0,0" xf:Animations.Primary="{xf:Animate BasedOn={StaticResource FadeIn}, Event=Visibility}">
             <hc:UniformSpacingPanel Spacing="10"  VerticalAlignment="Top" HorizontalAlignment="Center">
-                <hc:TextBox x:Name="HintBox" TextAlignment="Left" Width="220"/>
+                <hc:TextBox Style="{StaticResource MyTextBoxStyle}" x:Name="HintBox" TextAlignment="Left" Width="220"/>
             </hc:UniformSpacingPanel>
             <hc:UniformSpacingPanel Spacing="10" Margin="202,35,0,0"  VerticalAlignment="Top" HorizontalAlignment="Left">
                 <TextBlock Text="跳过" MouseLeftButtonDown="NextTB_MouseLeftButtonDown"  Style="{StaticResource NextTB}"/>
diff --git a/Control/UserControls/Config/MotionControl.xaml b/Control/UserControls/Config/MotionControl.xaml
index 78d5e80..bf2861a 100644
--- a/Control/UserControls/Config/MotionControl.xaml
+++ b/Control/UserControls/Config/MotionControl.xaml
@@ -100,6 +100,7 @@
             <hc:UniformSpacingPanel Spacing="10"  Margin="10,5,0,0" Grid.ColumnSpan="4">
                 <TextBlock Text="主面板:" VerticalAlignment="Center" Margin="0,5,0,0" Width="55"/>
                 <hc:TextBox HorizontalAlignment="Left" 
+                            Style="{StaticResource MyTextBoxStyle}"
                             Tag="{x:Static cst:HotKeyType.Main}"
                             VerticalAlignment="Top" 
                             IsReadOnly="True" 
@@ -109,11 +110,8 @@
                             KeyDown="HotKeyDown"
                             KeyUp="HotKeyUp"
                             InputMethod.IsInputMethodEnabled="False"
-                            >
-                    <hc:TextBox.Background>
-                        <SolidColorBrush Color="White" Opacity="0.7" />
-                    </hc:TextBox.Background>
-                </hc:TextBox>
+                            />
+
                 <CheckBox Content="启用" 
                           Style="{StaticResource MyCheckBoxStyle}"
                           Click="EnableHotKey_Click" 
@@ -123,6 +121,7 @@
             <hc:UniformSpacingPanel Spacing="10" Margin="10,5,0,0" Grid.ColumnSpan="4">
                 <TextBlock Text="待办任务:" Margin="0,5,0,0"  Width="55"/>
                 <hc:TextBox HorizontalAlignment="Left" 
+                            Style="{StaticResource MyTextBoxStyle}"
                             Tag="{x:Static cst:HotKeyType.ToDo}"
                             VerticalAlignment="Top" 
                             IsReadOnly="True" 
@@ -132,11 +131,8 @@
                             KeyDown="HotKeyDown"
                             KeyUp="HotKeyUp"
                             InputMethod.IsInputMethodEnabled="False"
-                            >
-                    <hc:TextBox.Background>
-                        <SolidColorBrush Color="White" Opacity="0.7" />
-                    </hc:TextBox.Background>
-                </hc:TextBox>
+                            />
+
                 <CheckBox Content="启用" 
                           Style="{StaticResource MyCheckBoxStyle}"
                           Click="EnableHotKey_Click" 
@@ -147,6 +143,7 @@
             <hc:UniformSpacingPanel Spacing="10" Margin="10,5,0,0" Grid.ColumnSpan="4">
                 <TextBlock Text="拾色器:" Margin="0,5,0,0"  Width="55"/>
                 <hc:TextBox HorizontalAlignment="Left" 
+                            Style="{StaticResource MyTextBoxStyle}"
                             Tag="{x:Static cst:HotKeyType.ColorPicker}"
                             VerticalAlignment="Top" 
                             IsReadOnly="True" 
@@ -156,11 +153,7 @@
                             KeyDown="HotKeyDown"
                             KeyUp="HotKeyUp"
                             InputMethod.IsInputMethodEnabled="False"
-                            >
-                    <hc:TextBox.Background>
-                        <SolidColorBrush Color="White" Opacity="0.7" />
-                    </hc:TextBox.Background>
-                </hc:TextBox>
+                            />
                 <CheckBox Content="启用" 
                           Style="{StaticResource MyCheckBoxStyle}"
                           Tag="{x:Static cst:HotKeyType.ColorPicker}"
diff --git a/Control/UserControls/PannelCard/LeftCardControl.xaml b/Control/UserControls/PannelCard/LeftCardControl.xaml
index ace84e8..6d91bd2 100644
--- a/Control/UserControls/PannelCard/LeftCardControl.xaml
+++ b/Control/UserControls/PannelCard/LeftCardControl.xaml
@@ -186,7 +186,7 @@
                     <ListBox.ItemTemplate>
                         <DataTemplate>
                             <StackPanel Tag="{Binding}">
-                                <TextBox Text="{Binding Path=MenuName, Mode=TwoWay}"
+                                <TextBox Style="{StaticResource MyTextBoxStyle}" Text="{Binding Path=MenuName, Mode=TwoWay}"
                                 HorizontalAlignment="Left"
                                 Width="{Binding RelativeSource={RelativeSource FindAncestor,AncestorType={x:Type ListBox},AncestorLevel=1},Path=Tag, Mode=TwoWay, Converter={StaticResource MenuWidthConvert}, ConverterParameter=35}"
                                 FontSize="16"
diff --git a/Control/Windows/IconfontWindow.xaml b/Control/Windows/IconfontWindow.xaml
index 0d9350f..55dde69 100644
--- a/Control/Windows/IconfontWindow.xaml
+++ b/Control/Windows/IconfontWindow.xaml
@@ -51,7 +51,7 @@
             </Border.Background>-->
             <hc:DialogContainer>
                 <Grid MouseDown="DragMove">
-                    <TextBox x:Name="CheckSettingUrl" Visibility="Collapsed" Text="{Binding IsSettingUrl}" TextChanged="CheckSettingUrl_TextChanged"/>
+                    <TextBox x:Name="CheckSettingUrl" Style="{StaticResource MyTextBoxStyle}" Visibility="Collapsed" Text="{Binding IsSettingUrl}" TextChanged="CheckSettingUrl_TextChanged"/>
                     <hc:TabControl x:Name="MyTabControl" 
                                IsAnimationEnabled="True" 
                                SelectionChanged="TabControl_SelectionChanged" 
diff --git a/Control/Windows/ToDoInfoWindow.xaml b/Control/Windows/ToDoInfoWindow.xaml
index 0d3b865..ebafe09 100644
--- a/Control/Windows/ToDoInfoWindow.xaml
+++ b/Control/Windows/ToDoInfoWindow.xaml
@@ -44,12 +44,13 @@
                             <TextBlock Text="待办任务:"  Style="{StaticResource LeftTB}"/>
                             <TextBlock Text="*" Foreground="Red" />
                         </WrapPanel>
-                        <TextBox x:Name="Title" Width="290" Text="{Binding Title, Mode=OneWay}" FontSize="14" />
+                        <TextBox x:Name="Title" Style="{StaticResource MyTextBoxStyle}" Width="290" Text="{Binding Title, Mode=OneWay}" FontSize="14" />
                     </hc:UniformSpacingPanel>
 
                     <hc:UniformSpacingPanel Spacing="10" Grid.ColumnSpan="4" Margin="0,10,0,0">
                         <TextBlock Text="待办详情:"  Style="{StaticResource LeftTB}"/>
                         <TextBox x:Name="Msg" TextWrapping="Wrap"
+                                 Style="{StaticResource MyTextBoxStyle}"
                              Margin="5,0,0,0"
                              Text="{Binding Msg, Mode=OneWay}"
                              AcceptsReturn="True"
@@ -73,7 +74,11 @@
                             <TextBlock Text="指定时间:"  Style="{StaticResource LeftTB}"/>
                             <TextBlock Text="*" Foreground="Red"/>
                         </WrapPanel>
-                        <hc:DateTimePicker x:Name="ExeTime" Text="{Binding ExeTime, Mode=OneWay}" ErrorStr="Error!"  Width="200" Margin="1.6,0,0,0"/>
+                        <hc:DateTimePicker x:Name="ExeTime" Text="{Binding ExeTime, Mode=OneWay}" ErrorStr="Error!"  Width="200" Margin="1.6,0,0,0">
+                            <hc:DateTimePicker.Background>
+                                <SolidColorBrush Color="White" Opacity="0.7"/>
+                            </hc:DateTimePicker.Background>
+                        </hc:DateTimePicker>
                     </hc:UniformSpacingPanel>
 
                     <hc:UniformSpacingPanel x:Name="CronPanel" Height="30" Visibility="Collapsed" Spacing="10" Grid.ColumnSpan="4" Margin="0,10,0,0">
@@ -81,7 +86,7 @@
                             <TextBlock Text="CRON:"  Style="{StaticResource LeftTB}"/>
                             <TextBlock Text="*" Foreground="Red" />
                         </WrapPanel>
-                        <TextBox x:Name="Cron" Width="290" Text="{Binding Cron, Mode=OneWay}" FontSize="14" />
+                        <TextBox x:Name="Cron" Style="{StaticResource MyTextBoxStyle}" Width="290" Text="{Binding Cron, Mode=OneWay}" FontSize="14" />
                     </hc:UniformSpacingPanel>
 
 
@@ -95,7 +100,7 @@
 
 
                     <hc:UniformSpacingPanel Spacing="10" Margin="0,10,0,0" Grid.ColumnSpan="4">
-                        <Button Content="保存" Style="{StaticResource Btn1}" Margin="320,6,-208,-10"
+                        <Button Content="保存" Style="{StaticResource MyBtnStyle}" Margin="320,6,-208,-10"
                             Click="Save_Button_Click"/>
                     </hc:UniformSpacingPanel>
                 </StackPanel>
diff --git a/MainWindow.xaml b/MainWindow.xaml
index 76ee9ab..5939766 100644
--- a/MainWindow.xaml
+++ b/MainWindow.xaml
@@ -272,6 +272,7 @@
                              FontSize="16"
                              BorderThickness="0"
                              TextChanged="SearchBox_TextChanged"
+                             Style="{StaticResource MyTextBoxStyle}"
                              >
                         <TextBox.Background>
                             <SolidColorBrush Color="White" Opacity="0.5" />
diff --git a/Resource/Dictionary/CommonStyle.xaml b/Resource/Dictionary/CommonStyle.xaml
index 1ad6d47..3b4419f 100644
--- a/Resource/Dictionary/CommonStyle.xaml
+++ b/Resource/Dictionary/CommonStyle.xaml
@@ -120,4 +120,20 @@
     </Style>
 
 
+    <!--text box style-->
+    <Style x:Key="MyTextBoxStyle" TargetType="TextBox" BasedOn="{StaticResource TextBoxBaseStyle}">
+        <Setter Property="Background">
+            <Setter.Value>
+                <SolidColorBrush Color="White" Opacity="0.7"/>
+            </Setter.Value>
+        </Setter>
+        <Setter Property="BorderThickness" Value="0" />
+        <Style.Triggers>
+            <Trigger Property="IsFocused" Value="True">
+                <Setter Property="BorderThickness" Value="0" />
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+
+
 </ResourceDictionary>
\ No newline at end of file