From 1a13c963a5fb8cad92bf03667e411f46d6a6a843 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 17 十二月 2020 15:10:33 +0800
Subject: [PATCH] Revert "Merge branch 'tzy' into NewFilePath"
---
HDL_ON/UI/UI0-Public/Widget/ConfirmDialog.cs | 27 +++++++++++++++------------
1 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/HDL_ON/UI/UI0-Public/Widget/ConfirmDialog.cs b/HDL_ON/UI/UI0-Public/Widget/ConfirmDialog.cs
index beb9b2a..3d45a4a 100644
--- a/HDL_ON/UI/UI0-Public/Widget/ConfirmDialog.cs
+++ b/HDL_ON/UI/UI0-Public/Widget/ConfirmDialog.cs
@@ -1,4 +1,5 @@
-锘縰sing System;
+锘�
+using System;
using Shared;
using HDL_ON.UI.CSS;
@@ -6,7 +7,7 @@
{
/// <summary>
/// 閫氱敤浜屾纭鐣岄潰
- /// 鍙互鑷畾涔夋寜閽枃瀛�
+ /// 鍙互鑷畾涔夋寜閽枃瀛椼�佹彁绀哄唴瀹规敮鎸佸琛屾樉绀�
/// </summary>
public class ConfirmDialog : Dialog
{
@@ -45,8 +46,8 @@
Button btnTitle = new Button()
{
- Y = Application.GetRealHeight(16),
- Height = Application.GetRealHeight(30),
+ Y = Application.GetRealHeight(20),
+ Height = Application.GetRealHeight(22),
TextColor = CSS_Color.MainColor,
TextSize = CSS_FontSize.SubheadingFontSize,
TextAlignment = TextAlignment.Center,
@@ -54,17 +55,19 @@
Text = titleStr,
};
contentView.AddChidren(btnTitle);
-
+ int Width135 = Application.GetRealWidth(135);
+ //鎻愮ず鍐呭鎸夐挳
Button btnMsg = new Button()
{
- Gravity = Gravity.CenterHorizontal,
- Height = Application.GetRealHeight(25),
- Y = btnTitle.Bottom,
- Width = Application.GetRealHeight(200),
+ Y = btnTitle.Bottom + Application.GetRealHeight(4),
+ X = Application.GetRealWidth(6),
+ Height = Application.GetRealHeight(46),
+ Width = Application.GetRealWidth(258),
TextAlignment = TextAlignment.Center,
TextColor = CSS_Color.TextualColor,
TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
Text = msgStr,
+ IsMoreLines = true,
};
contentView.AddChidren(btnMsg);
@@ -80,7 +83,7 @@
Button btnCancel = new Button()
{
Y = btnLine.Bottom,
- Width = Application.GetRealWidth(135),
+ Width = Width135,
Height = Application.GetRealHeight(43),
TextAlignment = TextAlignment.Center,
TextColor = CSS_Color.TextualColor,
@@ -91,9 +94,9 @@
Button btnConfirm = new Button()
{
- X = btnCancel.Right,
+ X = contentView.Width - Width135,
Y = btnLine.Y,
- Width = Application.GetRealWidth(135),
+ Width = Width135,
Height = Application.GetRealHeight(45),
TextAlignment = TextAlignment.Center,
//TextColor = CSS_Color.TextualColor,
--
Gitblit v1.8.0