From 1b5ec1190a27ebe66f74ca9513020f805d3ec61c Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期二, 22 十二月 2020 13:54:19 +0800
Subject: [PATCH] 2021221-2
---
HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneLocationPage.cs | 27 ++++++++++++++-------------
1 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneLocationPage.cs b/HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneLocationPage.cs
old mode 100755
new mode 100644
index 8e14468..b2ad4b7
--- a/HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneLocationPage.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneLocationPage.cs
@@ -45,17 +45,6 @@
};
contentView.AddChidren(roomView);
- 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),
@@ -67,7 +56,19 @@
Tag = "ChooseIcon"
};
roomView.AddChidren(btnChoose);
- if(scene.roomIds.Contains(room.roomId))
+
+ 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);
+
+ if (scene.roomIds.Contains(room.roomId))
{
btnChoose.IsSelected = true;
lastButton = btnChoose;
@@ -86,7 +87,7 @@
};
roomView.AddChidren(btnLine);
- LoadEvent_ChangeSceneLocation(room, btnChoose);
+ LoadEvent_ChangeSceneLocation(room, btnRoomText);
}
}
--
Gitblit v1.8.0