From eda3fb873e59544ff36301b51e05aef64f87b0f9 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 27 八月 2021 13:21:21 +0800
Subject: [PATCH] Merge branch 'newBranch1' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into newBranch1
---
HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/View/FrameLayout50.cs | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/View/FrameLayout50.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/View/FrameLayout50.cs
index eacada3..5dbfbec 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/View/FrameLayout50.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/View/FrameLayout50.cs
@@ -20,10 +20,11 @@
public Button btnText = new Button
{
TextSize = TextSize.Text16,
- Width = Application.GetRealWidth(200),
- Height = Application.GetRealHeight(22),
+ Width = Application.GetRealWidth(150+20),
+ Height = Application.GetRealHeight(32),//22
TextColor = CSS.CSS_Color.textColor,
X = Application.GetRealWidth(16),
+ IsMoreLines=true,
};
/// <summary>
@@ -31,11 +32,11 @@
/// </summary>
public Button btnEditText = new Button
{
- Width = Application.GetRealWidth(357 - 52 - 200 - 16),
+ Width = Application.GetRealWidth(357 - 52 - 150 - 30-16),
Height = Application.GetRealHeight(20),
TextSize = TextSize.Text14,
TextColor = CSS.CSS_Color.textCancelColor,
- X = Application.GetRealWidth(200 + 16),
+ X = Application.GetRealWidth(150+30+16),
TextAlignment = TextAlignment.CenterRight,
};
--
Gitblit v1.8.0