From f77a3add1e7ab266e473da9128bbe5758ba3a890 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期日, 20 十二月 2020 19:29:03 +0800
Subject: [PATCH] Merge branch 'NewFilePath' into CJL
---
HDL_ON/UI/UI2/FuntionControlView/Music/View/MusicSourceView.cs | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/View/MusicSourceView.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/View/MusicSourceView.cs
old mode 100644
new mode 100755
index 6cb0965..2c622a0
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/View/MusicSourceView.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/View/MusicSourceView.cs
@@ -20,8 +20,8 @@
{
X = Application.GetRealWidth(16),
Y = Application.GetRealHeight(13),
- Width = Application.GetMinRealAverage(24),
- Height = Application.GetMinRealAverage(24),
+ Width = Application.GetRealWidth(24),
+ Height = Application.GetRealWidth(24),
};
/// <summary>
///鏂囨湰
@@ -58,8 +58,8 @@
{
X = Application.GetRealWidth(339),
Y = Application.GetRealHeight(17),
- Width = Application.GetMinRealAverage(16),
- Height = Application.GetMinRealAverage(16),
+ Width = Application.GetRealWidth(16),
+ Height = Application.GetRealWidth(16),
UnSelectedImagePath = "MusicIcon/sourceNetx.png",
};
@@ -104,8 +104,8 @@
fLayout.AddChidren(inputTextBtn);
nextLevelBtn.X = Application.GetRealWidth(333);
nextLevelBtn.Y = Application.GetRealHeight(11);
- nextLevelBtn.Width = Application.GetMinRealAverage(28);
- nextLevelBtn.Height = Application.GetMinRealAverage(28);
+ nextLevelBtn.Width = Application.GetRealWidth(28);
+ nextLevelBtn.Height = Application.GetRealWidth(28);
nextLevelBtn.UnSelectedImagePath = "MusicIcon/edit.png";
}
fLayout.AddChidren(textBtn);
--
Gitblit v1.8.0