From 2d03454a09569c60ac1e658bacccd2bf0e2d0dfd Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期一, 25 九月 2023 11:08:23 +0800
Subject: [PATCH] Merge branch 'wjc' into Dev-Branch
---
HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/ButtonFramLayout.cs | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/ButtonFramLayout.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/ButtonFramLayout.cs
index 9bf4e83..f80c659 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/ButtonFramLayout.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/ButtonFramLayout.cs
@@ -18,7 +18,7 @@
{
this.Width = Application.GetRealWidth(width);
this.Height = Application.GetRealHeight(height);
- this.Radius = (uint)Application.GetRealHeight(cornerValue);
+ //this.Radius = (uint)Application.GetRealHeight(cornerValue);
}
Button btnImage = new Button
@@ -40,7 +40,6 @@
TextAlignment = TextAlignment.Center,
Gravity = Gravity.CenterHorizontal,
Padding = new Padding(0, 20, 0, 20),
- IsMoreLines = true,
Name = "btnName",
@@ -103,6 +102,7 @@
/// </summary>
public void AddLeftLine()
{
+ btnLeftLine.Height = this.Height;
this.AddChidren(btnLeftLine);
}
/// <summary>
@@ -110,6 +110,8 @@
/// </summary>
public void AddRightLine()
{
+ btnRightLine.Height = this.Height;
+ btnRightLine.X = this.Width - Application.GetRealWidth(1);
this.AddChidren(btnRightLine);
}
@@ -118,6 +120,7 @@
/// </summary>
public void AddTopLine()
{
+ btnTopLine.Width = this.Width;
this.AddChidren(btnTopLine);
}
/// <summary>
@@ -125,6 +128,8 @@
/// </summary>
public void AddBottomLine()
{
+ btnBottomLine.Y = this.Height - Application.GetRealHeight(1);
+ btnBottomLine.Width = this.Width;
this.AddChidren(btnBottomLine);
}
@@ -146,9 +151,12 @@
EventHandler<MouseEventArgs> UpClick = (sender, e) =>
{
this.BackgroundColor = 0x00000000;
-
+
//寮硅捣鏉ヨ繕鍘熻儗鏅鑹�
};
+ btnImage.Tag = this.Tag;
+ btnName.Tag = this.Tag;
+
this.MouseUpEventHandler += UpClick;
btnImage.MouseUpEventHandler += UpClick;
btnName.MouseUpEventHandler += UpClick;
@@ -165,10 +173,12 @@
EventHandler<MouseEventArgs> DownClick = (sender, e) =>
{
+
//鎸変笅鍘绘敼鍙樿儗鏅鑹�
- this.BackgroundColor = 0xff454635;
+ this.BackgroundColor = 0xFFEFEFEF;
action?.Invoke(this, btnImage, btnName);
};
+
this.MouseDownEventHandler += DownClick;
btnImage.MouseDownEventHandler += DownClick;
btnName.MouseDownEventHandler += DownClick;
--
Gitblit v1.8.0