From 489d3bd60ad7dc2fecb398b09cf4c52df16f0fc2 Mon Sep 17 00:00:00 2001
From: Davin <591807572@qq.com>
Date: 星期三, 26 七月 2023 15:55:30 +0800
Subject: [PATCH] Merge branch 'Dev-Branch' of http://59.41.255.150:6688/r/~wxr/OnPro into Dev-Branch
---
HDL_ON/UI/UI0-Stan/Form/DeviceFunctionCardCommonForm.cs | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/HDL_ON/UI/UI0-Stan/Form/DeviceFunctionCardCommonForm.cs b/HDL_ON/UI/UI0-Stan/Form/DeviceFunctionCardCommonForm.cs
index 3608632..9f4971b 100644
--- a/HDL_ON/UI/UI0-Stan/Form/DeviceFunctionCardCommonForm.cs
+++ b/HDL_ON/UI/UI0-Stan/Form/DeviceFunctionCardCommonForm.cs
@@ -134,7 +134,7 @@
btnDeviceName.TextColor = CSS_Color.FirstLevelTitleColor;
btnDeviceName.TextSize = CSS_FontSize.EmphasisFontSize_FirstLevel;
btnDeviceName.Text = device.name;
- btnDeviceName.Width = btnDeviceName.GetRealWidthByText();
+ //btnDeviceName.Width = btnDeviceName.GetRealWidthByText();
FrameWhiteCentet1.AddChidren(btnDeviceName);
//鎴块棿鍚嶅瓧
this.btnRoomName = new NormalViewControl(270, 21, true);
@@ -143,7 +143,7 @@
btnRoomName.TextColor = CSS_Color.PromptingColor1;
btnRoomName.TextSize = CSS_FontSize.PromptFontSize_FirstLevel;
btnRoomName.Text = device.GetRoomListName();
- btnRoomName.Width = btnRoomName.GetRealWidthByText();
+ //btnRoomName.Width = btnRoomName.GetRealWidthByText();
FrameWhiteCentet1.AddChidren(btnRoomName);
if (ShowColltionButton)
{
@@ -327,10 +327,10 @@
//浠庢柊璁＄畻瀹藉害
this.btnDeviceName.Text = btnHigherDeviceName.Text;
- this.btnDeviceName.Width = this.btnDeviceName.GetRealWidthByText();
+ //this.btnDeviceName.Width = this.btnDeviceName.GetRealWidthByText();
this.btnRoomName.Text = btnHigherRoom.Text;
- this.btnRoomName.Width = this.btnRoomName.GetRealWidthByText();
+ //this.btnRoomName.Width = this.btnRoomName.GetRealWidthByText();
//鍥炶皟浜嬩欢
this.SettionFinishEvent?.Invoke();
--
Gitblit v1.8.0