From ed9547e90c664739da9d3535bc01f66f24e184db Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 09 六月 2021 17:46:32 +0800
Subject: [PATCH] Merge branch 'tzy2' into wxr6

---
 HDL_ON/Common/Utlis/FloorRoomSelectPopupView.cs |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/HDL_ON/Common/Utlis/FloorRoomSelectPopupView.cs b/HDL_ON/Common/Utlis/FloorRoomSelectPopupView.cs
old mode 100755
new mode 100644
index e0f3720..db8e6c3
--- a/HDL_ON/Common/Utlis/FloorRoomSelectPopupView.cs
+++ b/HDL_ON/Common/Utlis/FloorRoomSelectPopupView.cs
@@ -241,6 +241,7 @@
             {
                 //鍏ㄩ儴
                 btnFloorName.Text = Language.StringByID(StringId.All);
+                btnFloorName.Width = btnFloorName.GetTextWidth();
             }
             //鎴块棿
             else if (selectType == 3)
@@ -250,6 +251,7 @@
                     if (roomInfo.uid == this.nowShowSelectId)
                     {
                         btnFloorName.Text = roomInfo.floorName + roomInfo.roomName;
+                        btnFloorName.Width = btnFloorName.GetTextWidth();
                         return;
                     }
                 }
@@ -262,6 +264,7 @@
                     if (floorInfo.uid == this.nowShowSelectId)
                     {
                         btnFloorName.Text = floorInfo.roomName;
+                        btnFloorName.Width = btnFloorName.GetTextWidth();
                     }
                 }
             }

--
Gitblit v1.8.0