From 5bfb959c47017825c8cf7dc8570c55b04dab694c Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 09 六月 2021 16:42:11 +0800
Subject: [PATCH] Merge branch 'dev-tzy' into wxr6
---
HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/View/PirView.cs | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/View/PirView.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/View/PirView.cs
index 8c536c0..5b4fd79 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/View/PirView.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/View/PirView.cs
@@ -82,7 +82,7 @@
public Button stateIconBtn = new Button
{
Y = Application.GetRealHeight(23),
- X = Application.GetRealWidth(291),
+ X = Application.GetRealWidth(291-5),
Width = Application.GetRealWidth(8),
Height = Application.GetRealWidth(8),
UnSelectedImagePath ="PirIcon/offline.png",
@@ -95,8 +95,8 @@
public Button stateTextBtn = new Button
{
Y = Application.GetRealHeight(18),
- X = Application.GetRealWidth(303),
- Width = Application.GetRealWidth(30),
+ X = Application.GetRealWidth(303-5),
+ Width = Application.GetRealWidth(30+5),
Height = Application.GetRealHeight(17),
TextID = StringId.zaixianhwb,
TextAlignment = TextAlignment.CenterLeft,
@@ -147,6 +147,7 @@
geBtn.Width = geBtn.GetTextWidth();
devfLayout.AddChidren(sumBtn);
sumBtn.X = geBtn.Right;
+ sumBtn.TextAlignment = TextAlignment.CenterLeft;
devfLayout.AddChidren(stateIconBtn);
devfLayout.AddChidren(stateTextBtn);
devfLayout.AddChidren(lineBtn);
--
Gitblit v1.8.0