From 43b0d5870d528f23ecd6aeceb6cfd4325188b46f Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 01 七月 2021 15:50:43 +0800
Subject: [PATCH] Revert "1"
---
HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPage.cs | 47 ++++++++++++++++++++++++-----------------------
1 files changed, 24 insertions(+), 23 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPage.cs b/HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPage.cs
index f1c6834..f588139 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPage.cs
@@ -17,6 +17,7 @@
/// </summary>
VerticalScrolViewLayout contentView;
+ Button btnAllRoomText;
Button btnChooseAll;
#endregion
@@ -59,17 +60,6 @@
};
contentView.AddChidren(allRoomView);
- Button btnAllRoomText = new Button()
- {
- X = Application.GetRealWidth(16),
- Width = Application.GetRealWidth(280),
- TextID = StringId.All,
- TextSize= CSS_FontSize.SubheadingFontSize,
- TextColor = CSS_Color.FirstLevelTitleColor,
- TextAlignment = TextAlignment.CenterLeft,
- };
- allRoomView.AddChidren(btnAllRoomText);
-
btnChooseAll = new Button()
{
X = Application.GetRealWidth(331),
@@ -81,6 +71,17 @@
IsSelected = true
};
allRoomView.AddChidren(btnChooseAll);
+
+ btnAllRoomText = new Button()
+ {
+ X = Application.GetRealWidth(16),
+ TextID = StringId.All,
+ TextSize= CSS_FontSize.SubheadingFontSize,
+ TextColor = CSS_Color.FirstLevelTitleColor,
+ TextAlignment = TextAlignment.CenterLeft,
+ };
+ allRoomView.AddChidren(btnAllRoomText);
+
foreach(var room in SpatialInfo.CurrentSpatial.RoomList)
{
@@ -101,17 +102,6 @@
};
roomView.AddChidren(btnLine);
- Button btnRoomText = new Button()
- {
- X = Application.GetRealWidth(16),
- Width = Application.GetRealWidth(280),
- TextSize = CSS_FontSize.SubheadingFontSize,
- TextColor = CSS_Color.FirstLevelTitleColor,
- TextAlignment = TextAlignment.CenterLeft,
- Text = room.floorName + room.roomName,
- };
- roomView.AddChidren(btnRoomText);
-
Button btnChoose = new Button()
{
X = Application.GetRealWidth(331),
@@ -124,7 +114,18 @@
Tag = "ChooseIcon"
};
roomView.AddChidren(btnChoose);
- btnChoose.MouseUpEventHandler = (sender, e) => {
+
+ Button btnRoomText = new Button()
+ {
+ X = Application.GetRealWidth(16),
+ //Width = Application.GetRealWidth(280),
+ TextSize = CSS_FontSize.SubheadingFontSize,
+ TextColor = CSS_Color.FirstLevelTitleColor,
+ TextAlignment = TextAlignment.CenterLeft,
+ Text = room.floorName + room.roomName,
+ };
+ roomView.AddChidren(btnRoomText);
+ btnRoomText.MouseUpEventHandler = (sender, e) => {
btnChoose.IsSelected = !btnChoose.IsSelected;
LoadEvent_RoomSelected(room, btnChoose.IsSelected);
};
--
Gitblit v1.8.0