From cda315b3a19919cae922bdbe96bc20eab4e29fcc Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 30 六月 2022 18:03:24 +0800
Subject: [PATCH] 版本合并冲突修改
---
HDL_ON/UI/UI0-Public/TopViewDiv.cs | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/UI/UI0-Public/TopViewDiv.cs b/HDL_ON/UI/UI0-Public/TopViewDiv.cs
index 7cedd9d..c85c12c 100644
--- a/HDL_ON/UI/UI0-Public/TopViewDiv.cs
+++ b/HDL_ON/UI/UI0-Public/TopViewDiv.cs
@@ -261,9 +261,9 @@
var btnSetting = new Button()
{
- X = Application.GetRealWidth(270),
+ X = Application.GetRealWidth(337-100),
Y = Application.GetRealHeight(29),
- Width = Application.GetMinRealAverage(80),
+ Width = Application.GetMinRealAverage(100),
Height = Application.GetMinRealAverage(28),
TextColor = CSS_Color.MainColor,
TextSize = CSS_FontSize.TextFontSize,
--
Gitblit v1.8.0