From c88a3777ab456af4ecf01604f4b2ae4762852148 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 14 二月 2023 15:02:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/release0123' into wjc
---
HDL_ON/UI/UI0-Public/TopViewDiv.cs | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/HDL_ON/UI/UI0-Public/TopViewDiv.cs b/HDL_ON/UI/UI0-Public/TopViewDiv.cs
index 63e8ba3..7951076 100644
--- a/HDL_ON/UI/UI0-Public/TopViewDiv.cs
+++ b/HDL_ON/UI/UI0-Public/TopViewDiv.cs
@@ -169,11 +169,15 @@
var btnSetting = new Button()
{
- X = Application.GetRealWidth(337),
- Y = Application.GetRealHeight(29),
- Width = Application.GetMinRealAverage(28),
- Height = Application.GetMinRealAverage(28),
- UnSelectedImagePath = "FunctionIcon/Light/LightScene/SetLightSceneIcon.png",
+ X = Application.GetRealWidth(337-37),
+ Y = Application.GetRealHeight(20),
+ Width = Application.GetMinRealAverage(28+37),
+ Height = Application.GetMinRealAverage(28+19),
+ TextID = StringId.CombinedDimming,
+ TextSize = CSS_FontSize.TextFontSize,
+ TextColor = CSS_Color.MainColor,
+ IsMoreLines = true
+ //UnSelectedImagePath = "FunctionIcon/Light/LightScene/SetLightSceneIcon.png",
};
contentView.AddChidren(btnSetting);
--
Gitblit v1.8.0