From b544d5cccd76735e034c8055918a50927b437474 Mon Sep 17 00:00:00 2001
From: wenxiangchao <wenxiangchao@ihengxin.com.cn>
Date: 星期二, 10 十一月 2026 08:29:04 +0800
Subject: [PATCH] fix: 维护模式重复进入失败与按钮灰死 + Broker 并发验证用例
---
HMI.UI/Style/WindowResources.xaml | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/HMI.UI/Style/WindowResources.xaml b/HMI.UI/Style/WindowResources.xaml
index d12c27e..bd5f6c2 100644
--- a/HMI.UI/Style/WindowResources.xaml
+++ b/HMI.UI/Style/WindowResources.xaml
@@ -4,13 +4,12 @@
xmlns:sys="clr-namespace:System;assembly=mscorlib"
>
<ResourceDictionary.MergedDictionaries>
- <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 PrimaryColor}"/>
- <Setter Property="ui:DpPlugin.HoverColor" Value="{StaticResource SecondPrimaryColor}"/>
+ <Setter Property="Background" Value="{DynamicResource PrimaryColor}"/>
+ <Setter Property="ui:DpPlugin.HoverColor" Value="{DynamicResource SecondPrimaryColor}"/>
<Setter Property="FontFamily" Value="{StaticResource iconfont}"/>
<Setter Property="FontWeight" Value="SemiBold"/>
<Setter Property="Foreground" Value="White"/>
@@ -50,8 +49,8 @@
<Style x:Key="ChildWindowButton" BasedOn="{StaticResource WindowButton}" TargetType="Button">
<Setter Property="FontSize" Value="15"/>
<Setter Property="Width" Value="30"/>
- <Setter Property="Background" Value="{StaticResource SecondPrimaryColor}"/>
- <Setter Property="ui:DpPlugin.HoverColor" Value="{StaticResource PrimaryColor}"/>
+ <Setter Property="Background" Value="{DynamicResource SecondPrimaryColor}"/>
+ <Setter Property="ui:DpPlugin.HoverColor" Value="{DynamicResource PrimaryColor}"/>
</Style>
<Style x:Key="ChildWindowCloseButton" BasedOn="{StaticResource ChildWindowButton}" TargetType="Button">
@@ -59,9 +58,9 @@
</Style>
<Style x:Key="LinkButton" TargetType="Button">
- <Setter Property="ui:DpPlugin.HoverColor" Value="{StaticResource SecondPrimaryColor}"/>
+ <Setter Property="ui:DpPlugin.HoverColor" Value="{DynamicResource SecondPrimaryColor}"/>
<Setter Property="FontFamily" Value="{StaticResource iconfont}"/>
- <Setter Property="Foreground" Value="{StaticResource SecondPrimaryColor}"/>
+ <Setter Property="Foreground" Value="{DynamicResource SecondPrimaryColor}"/>
<Setter Property="Template">
<Setter.Value>
--
Gitblit v1.9.1