From 07b0239f824ddb5a0cadf93f20ff6247f72baca2 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 19 一月 2022 11:32:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wxr0114' into wjc
---
HDL_ON/UI/UI2/FuntionControlView/Electrical/SocketPage.cs | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Electrical/SocketPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Electrical/SocketPage.cs
index c255299..96945a4 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Electrical/SocketPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Electrical/SocketPage.cs
@@ -154,7 +154,8 @@
TextAlignment = TextAlignment.Center,
TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
TextColor = CSS_Color.TextualColor,
- TextID = StringId.InstantaneousValue
+ TextID = StringId.InstantaneousValue,
+ IsMoreLines = true
};
controlView.AddChidren(btnInstantaneousValueText);
EventHandler<MouseEventArgs> eventHandler = (sender, e) => {
@@ -198,12 +199,13 @@
{
X = Application.GetRealWidth(200),
Y = btnTotalElectricity.Bottom,
- Width = Application.GetRealWidth(235),
+ Width = Application.GetRealWidth(100),
Height = Application.GetRealHeight(29),
TextAlignment = TextAlignment.CenterLeft,
TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
TextColor = CSS_Color.TextualColor,
- TextID = StringId.CumulativePowerConsumption
+ TextID = StringId.CumulativePowerConsumption,
+ IsMoreLines = true
};
controlView.AddChidren(btnTotalElectricityText);
EventHandler<MouseEventArgs> eventHandler = (sender, e) => {
--
Gitblit v1.8.0