From c0021397eeb8335d6d1f20990c71533c3d94e7af Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期五, 10 一月 2020 17:02:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into DEV_GXC
---
ZigbeeApp/Shared/Phone/Device/CommonForm/FunctionIconButton.cs | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/CommonForm/FunctionIconButton.cs b/ZigbeeApp/Shared/Phone/Device/CommonForm/FunctionIconButton.cs
old mode 100755
new mode 100644
index 5fda24c..ac6d475
--- a/ZigbeeApp/Shared/Phone/Device/CommonForm/FunctionIconButton.cs
+++ b/ZigbeeApp/Shared/Phone/Device/CommonForm/FunctionIconButton.cs
@@ -60,12 +60,12 @@
{
ImageBG = new Button()
{
- Width = Application.GetMinRealAverage(207),
- Height = Application.GetMinRealAverage(207),
+ Width = Application.GetRealWidth(207),
+ Height = Application.GetRealWidth(207),
Gravity = Gravity.Center,
BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor,
SelectedBackgroundColor = ZigbeeColor.Current.GXCSelectedBackgroundColor,
- Radius = (uint)Application.GetMinRealAverage(207 / 2)
+ Radius = (uint)Application.GetRealWidth(207 / 2)
};
AddChidren(ImageBG);
--
Gitblit v1.8.0