From d7e25d6a5960b3495cd4d8a67545410e03ca7962 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期日, 06 六月 2021 16:42:08 +0800
Subject: [PATCH] Merge branch 'wxr4' into temp-wxr
---
HDL_ON/UI/UI0-Public/Widget/EmptyTipView.cs | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/HDL_ON/UI/UI0-Public/Widget/EmptyTipView.cs b/HDL_ON/UI/UI0-Public/Widget/EmptyTipView.cs
index c0ac00b..fd8cbcf 100644
--- a/HDL_ON/UI/UI0-Public/Widget/EmptyTipView.cs
+++ b/HDL_ON/UI/UI0-Public/Widget/EmptyTipView.cs
@@ -23,29 +23,33 @@
/// <summary>
///
/// </summary>
- public EmptyTipView(string tipMsg ="")
+ public EmptyTipView(string tipMsg ="",int btnTipNotY=0)
{
if(tipMsg == "")
{
tipMsg = Language.StringByID(StringId.ContentIsEmpty);
}
- int tipHeight = Application.GetRealWidth(180);
+ int tipHeight = Application.GetRealWidth(180 + btnTipNotY);
- this.Height = tipHeight + Application.GetRealHeight(17);
+ this.Height = tipHeight + Application.GetRealHeight(17 );
BtnTipNot = new Button()
{
Gravity = Gravity.CenterHorizontal,
- Width = tipHeight,
- Height = tipHeight,
+ Width = Application.GetRealWidth(180),
+ Height = Application.GetRealWidth(180),
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