From 104cad5ee53eb05d3a89d508a029425726ae89ae Mon Sep 17 00:00:00 2001
From: chr <chr@mailcom>
Date: 星期一, 24 二月 2025 13:40:52 +0800
Subject: [PATCH] 上传长时间代码；
---
HMI.UI/Style/WindowResources.xaml | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/WPFProject/Style/WindowResources.xaml b/HMI.UI/Style/WindowResources.xaml
similarity index 77%
rename from WPFProject/Style/WindowResources.xaml
rename to HMI.UI/Style/WindowResources.xaml
index b1c0574..46d1925 100644
--- a/WPFProject/Style/WindowResources.xaml
+++ b/HMI.UI/Style/WindowResources.xaml
@@ -1,15 +1,15 @@
锘�<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
- xmlns:ctls="clr-namespace:WPFProject.Controls"
+ xmlns:ui="clr-namespace:HMI.UI"
>
<ResourceDictionary.MergedDictionaries>
- <ResourceDictionary Source="/WPFProject;component/Style/Colors.xaml"/>
- <ResourceDictionary Source="/WPFProject;component/Resources/Font/Font.xaml"/>
+ <ResourceDictionary Source="/HMI.UI;component/Style/Colors.xaml"/>
+ <ResourceDictionary Source="/HMI.UI;component/Resources/Font/Font.xaml"/>
</ResourceDictionary.MergedDictionaries>
<Style x:Key="WindowButton" TargetType="Button">
<Setter Property="Background" Value="{StaticResource MainBorder}"/>
- <Setter Property="ctls:DpPlugin.HoverColor" Value="{StaticResource ChildBorder}"/>
+ <Setter Property="ui:DpPlugin.HoverColor" Value="{StaticResource ChildBorder}"/>
<Setter Property="FontFamily" Value="{StaticResource iconfont}"/>
<Setter Property="FontWeight" Value="SemiBold"/>
<Setter Property="Foreground" Value="White"/>
@@ -17,8 +17,9 @@
<Setter Property="FontSize" Value="20"/>
<Setter Property="BorderThickness" Value="0"/>
<Setter Property="BorderBrush" Value="Transparent"/>
-
-
+ <Setter Property="Cursor" Value="Hand"/>
+ <Setter Property="WindowChrome.IsHitTestVisibleInChrome" Value="True"/>
+
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="Button">
@@ -33,7 +34,7 @@
<ControlTemplate.Triggers>
<Trigger Property="IsMouseOver" Value="True">
<Setter TargetName="border" Property="Background" Value="{Binding
- Path=(ctls:DpPlugin.HoverColor),RelativeSource={RelativeSource TemplatedParent}}"/>
+ Path=(ui:DpPlugin.HoverColor),RelativeSource={RelativeSource TemplatedParent}}"/>
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
@@ -42,22 +43,22 @@
</Style>
<Style x:Key="WindowCloseButton" BasedOn="{StaticResource WindowButton}" TargetType="Button">
- <Setter Property="ctls:DpPlugin.HoverColor" Value="Red"/>
+ <Setter Property="ui:DpPlugin.HoverColor" Value="Red"/>
</Style>
<Style x:Key="ChildWindowButton" BasedOn="{StaticResource WindowButton}" TargetType="Button">
<Setter Property="FontSize" Value="15"/>
<Setter Property="Width" Value="30"/>
<Setter Property="Background" Value="{StaticResource ChildBorder}"/>
- <Setter Property="ctls:DpPlugin.HoverColor" Value="{StaticResource MainBorder}"/>
+ <Setter Property="ui:DpPlugin.HoverColor" Value="{StaticResource MainBorder}"/>
</Style>
<Style x:Key="ChildWindowCloseButton" BasedOn="{StaticResource ChildWindowButton}" TargetType="Button">
- <Setter Property="ctls:DpPlugin.HoverColor" Value="Red"/>
+ <Setter Property="ui:DpPlugin.HoverColor" Value="Red"/>
</Style>
<Style x:Key="LinkButton" TargetType="Button">
- <Setter Property="ctls:DpPlugin.HoverColor" Value="{StaticResource ChildBorder}"/>
+ <Setter Property="ui:DpPlugin.HoverColor" Value="{StaticResource ChildBorder}"/>
<Setter Property="FontFamily" Value="{StaticResource iconfont}"/>
<Setter Property="Foreground" Value="{StaticResource ChildBorder}"/>
@@ -71,12 +72,11 @@
<ControlTemplate.Triggers>
<Trigger Property="IsMouseOver" Value="True">
<Setter TargetName="label" Property="Foreground" Value="{Binding
- Path=(ctls:DpPlugin.HoverColor),RelativeSource={RelativeSource TemplatedParent}}"/>
+ Path=(ui:DpPlugin.HoverColor),RelativeSource={RelativeSource TemplatedParent}}"/>
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>
-
</ResourceDictionary>
\ No newline at end of file
--
Gitblit v1.9.1