From 2614964c9c3e0c8740e208d4d0606fa8a518b9c4 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 01 九月 2021 15:16:39 +0800
Subject: [PATCH] Merge branch 'newBranch1' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into wxr7
---
HDL_ON/UI/UI2/FuntionControlView/Music/View/MusicView.cs | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/View/MusicView.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/View/MusicView.cs
old mode 100755
new mode 100644
index cb68d38..1dfd44f
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/View/MusicView.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/View/MusicView.cs
@@ -65,13 +65,12 @@
public Button mergeBtn = new Button
{
TextID=StringId.merge,
- X = Application.GetRealWidth(214 + 33),
+ X = Language.CurrentLanguage == "Chinese" ? Application.GetRealWidth(214 + 33): Application.GetRealWidth(214 + 28),
Y = Application.GetRealHeight(18 + 4),
- Width = Application.GetRealWidth(24+3+5),
+ Width = Language.CurrentLanguage == "Chinese" ? Application.GetRealWidth(24+3+5) : Application.GetRealWidth(24 + 3 + 15),
Height = Application.GetRealHeight(17),
TextColor = MusicColor.TextColor,
- TextSize=TextSize.Text12,
-
+ TextSize= Language.CurrentLanguage == "Chinese" ? TextSize.Text12 :CSS.CSS_FontSize.PromptFontSize_SecondaryLevel,
};
/// <summary>
///鏀惰棌鍥炬爣
--
Gitblit v1.8.0