Browse Source

[优化]TapItem控件样式鼠标进入触发前景色变更。

Jiangsheng 1 week ago
parent
commit
a457011744
3 changed files with 8 additions and 2 deletions
  1. 2 2
      SKMC.UI/Styles/TapItem.xaml
  2. 3 0
      SKMC.UI/Themes/Dark.xaml
  3. 3 0
      SKMC.UI/Themes/Light.xaml

+ 2 - 2
SKMC.UI/Styles/TapItem.xaml

@@ -28,9 +28,9 @@
                         <Trigger Property="IsSelected" Value="True">
                         <Trigger Property="IsSelected" Value="True">
                             <Setter TargetName="Border" Property="Background" Value="{DynamicResource Brush.SelectionSelectedBackground}" />
                             <Setter TargetName="Border" Property="Background" Value="{DynamicResource Brush.SelectionSelectedBackground}" />
                         </Trigger>
                         </Trigger>
-                        <Trigger Property="IsMouseOver" Value="True">
+                        <!--<Trigger Property="IsMouseOver" Value="True">
                             <Setter Property="Foreground" Value="{DynamicResource Brush.Signature}" />
                             <Setter Property="Foreground" Value="{DynamicResource Brush.Signature}" />
-                        </Trigger>
+                        </Trigger>-->
                     </ControlTemplate.Triggers>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
                 </ControlTemplate>
             </Setter.Value>
             </Setter.Value>

+ 3 - 0
SKMC.UI/Themes/Dark.xaml

@@ -83,6 +83,9 @@
     <SolidColorBrush x:Key="Brush.MotionIO.Default" Color="{DynamicResource Color.DashboardBackground}" />
     <SolidColorBrush x:Key="Brush.MotionIO.Default" Color="{DynamicResource Color.DashboardBackground}" />
     <SolidColorBrush x:Key="Brush.MotionIO.Actived" Color="{DynamicResource Color.Good}" />
     <SolidColorBrush x:Key="Brush.MotionIO.Actived" Color="{DynamicResource Color.Good}" />
 
 
+    <SolidColorBrush x:Key="Brush.State.OK" Color="{DynamicResource Color.Good}" />
+    <SolidColorBrush x:Key="Brush.State.NG" Color="{DynamicResource Color.Stop}" />
+
     <Color x:Key="Color.Signature">#00AFAF</Color>
     <Color x:Key="Color.Signature">#00AFAF</Color>
     <Color x:Key="Color.SignatureLight">#CCEAEC</Color>
     <Color x:Key="Color.SignatureLight">#CCEAEC</Color>
     <Color x:Key="Color.SignatureDark">#006D75</Color>
     <Color x:Key="Color.SignatureDark">#006D75</Color>

+ 3 - 0
SKMC.UI/Themes/Light.xaml

@@ -91,6 +91,9 @@
     <SolidColorBrush x:Key="Brush.MotionIO.Default" Color="{DynamicResource Color.DashboardBackground}" />
     <SolidColorBrush x:Key="Brush.MotionIO.Default" Color="{DynamicResource Color.DashboardBackground}" />
     <SolidColorBrush x:Key="Brush.MotionIO.Actived" Color="{DynamicResource Color.DrawCross}" />
     <SolidColorBrush x:Key="Brush.MotionIO.Actived" Color="{DynamicResource Color.DrawCross}" />
 
 
+    <SolidColorBrush x:Key="Brush.State.OK" Color="{DynamicResource Color.DrawCross}" />
+    <SolidColorBrush x:Key="Brush.State.NG" Color="{DynamicResource Color.Stop}" />
+
 
 
     <SolidColorBrush x:Key="Brush.Signature" Color="{DynamicResource Color.Signature}" />
     <SolidColorBrush x:Key="Brush.Signature" Color="{DynamicResource Color.Signature}" />
     <SolidColorBrush x:Key="Brush.SignatureLight" Color="{DynamicResource Color.SignatureLight}" />
     <SolidColorBrush x:Key="Brush.SignatureLight" Color="{DynamicResource Color.SignatureLight}" />