From 1b56157e8edc3f502810820d99b607e3629c7171 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 19 七月 2023 09:42:00 +0800
Subject: [PATCH] Merge branch 'Dev-Branch' into wjc
---
HDL_ON/UI/UI0-Public/TopViewDiv.cs | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/HDL_ON/UI/UI0-Public/TopViewDiv.cs b/HDL_ON/UI/UI0-Public/TopViewDiv.cs
index 8bcda0b..572cffe 100644
--- a/HDL_ON/UI/UI0-Public/TopViewDiv.cs
+++ b/HDL_ON/UI/UI0-Public/TopViewDiv.cs
@@ -225,6 +225,8 @@
};
}
+
+
/// <summary>
/// 鎴块棿鏍囬鍖哄煙
/// </summary>
@@ -261,17 +263,17 @@
/// <param name="room"></param>
/// <param name="skipAction"></param>
/// <param name="text"></param>
- public void LoadTopView_SettingText(Action skipAction,string text)
+ public void LoadTopView_SettingText(Action skipAction,string text,bool isDelColor = false)
{
LoadTopView();
var btnSetting = new Button()
{
- X = Application.GetRealWidth(337-100),
+ X = Application.GetRealWidth(355-100),
Y = Application.GetRealHeight(29),
Width = Application.GetMinRealAverage(100),
Height = Application.GetMinRealAverage(28),
- TextColor = CSS_Color.MainColor,
+ TextColor = isDelColor ?CSS_Color.WarningColor: CSS_Color.MainColor,
TextSize = CSS_FontSize.TextFontSize,
TextAlignment = TextAlignment.CenterRight,
Text = text,
--
Gitblit v1.8.0