From 5bfb959c47017825c8cf7dc8570c55b04dab694c Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 09 六月 2021 16:42:11 +0800
Subject: [PATCH] Merge branch 'dev-tzy' into wxr6
---
HDL_ON/UI/UI0-Public/Widget/EmptyTipView.cs | 16 ++++++----------
1 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/HDL_ON/UI/UI0-Public/Widget/EmptyTipView.cs b/HDL_ON/UI/UI0-Public/Widget/EmptyTipView.cs
index fd8cbcf..c0ac00b 100644
--- a/HDL_ON/UI/UI0-Public/Widget/EmptyTipView.cs
+++ b/HDL_ON/UI/UI0-Public/Widget/EmptyTipView.cs
@@ -23,33 +23,29 @@
/// <summary>
///
/// </summary>
- public EmptyTipView(string tipMsg ="",int btnTipNotY=0)
+ public EmptyTipView(string tipMsg ="")
{
if(tipMsg == "")
{
tipMsg = Language.StringByID(StringId.ContentIsEmpty);
}
- int tipHeight = Application.GetRealWidth(180 + btnTipNotY);
+ int tipHeight = Application.GetRealWidth(180);
- this.Height = tipHeight + Application.GetRealHeight(17 );
+ this.Height = tipHeight + Application.GetRealHeight(17);
BtnTipNot = new Button()
{
Gravity = Gravity.CenterHorizontal,
- Width = Application.GetRealWidth(180),
- Height = Application.GetRealWidth(180),
+ Width = tipHeight,
+ Height = tipHeight,
UnSelectedImagePath = "TipNot.png",
};
this.AddChidren(BtnTipNot);
- if(btnTipNotY!=0)
- {
- BtnTipNot.Y = Application.GetRealHeight(btnTipNotY);
- }
//绌虹┖濡備篃
Button btnTipNotText = new Button()
{
- Y = tipHeight ,
+ Y = tipHeight,
Height = Application.GetRealHeight(17),
Text = tipMsg,
TextAlignment = TextAlignment.Center,
--
Gitblit v1.8.0