From 1c4904d77f484c075080942d87785481b52b6fb2 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期一, 28 十月 2019 14:58:46 +0800
Subject: [PATCH] Revert "Merge branch 'dev-tzy' into DEV_GXC"
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Base/ButtonBase.cs | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Base/ButtonBase.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Base/ButtonBase.cs
index 9d754ef..587dde4 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Base/ButtonBase.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Base/ButtonBase.cs
@@ -230,7 +230,7 @@
//byteLength += Encoding.GetEncoding("gb2312").GetBytes(i_text[i].ToString()).Length;
}
int realWidth = byteLength * (int)textSize;
- return Application.GetRealWidth(realWidth + 20);
+ return Application.GetRealWidth(realWidth);
}
/// <summary>
@@ -240,7 +240,7 @@
{
var btnShadow = new PicViewControl(this.Width, Application.GetMinRealAverage(45), false);
btnShadow.X = this.X;
- btnShadow.Y = this.Bottom;
+ btnShadow.Y = this.Bottom - 1;
btnShadow.UnSelectedImagePath = "Item/BottomShadow.png";
this.Parent.AddChidren(btnShadow);
}
--
Gitblit v1.8.0