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/Common/Utlis/FloorRoomSelectPopupView.cs |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/HDL_ON/Common/Utlis/FloorRoomSelectPopupView.cs b/HDL_ON/Common/Utlis/FloorRoomSelectPopupView.cs
index dffe522..b6c1cb3 100644
--- a/HDL_ON/Common/Utlis/FloorRoomSelectPopupView.cs
+++ b/HDL_ON/Common/Utlis/FloorRoomSelectPopupView.cs
@@ -251,7 +251,7 @@
                     if (roomInfo.uid == this.nowShowSelectId)
                     {
                         btnFloorName.Text = roomInfo.floorName + roomInfo.roomName;
-                        btnFloorName.Width = btnFloorName.GetTextWidth();
+                        //btnFloorName.Width = btnFloorName.GetTextWidth();
                         return;
                     }
                 }
@@ -264,7 +264,7 @@
                     if (floorInfo.uid == this.nowShowSelectId)
                     {
                         btnFloorName.Text = floorInfo.roomName;
-                        btnFloorName.Width = btnFloorName.GetTextWidth();
+                        //btnFloorName.Width = btnFloorName.GetTextWidth();
                     }
                 }
             }

--
Gitblit v1.8.0