Some Buttons -> Label

Kkitut · Kkitut · commit 46aeb8e46048 · 2025-10-28T01:18:22.000+09:00
diff --git a/KeyViewer/Core/Drawer.cs b/KeyViewer/Core/Drawer.cs
@@ -277,14 +277,14 @@ public static bool DrawVectorConfig(VectorConfig vConfig) {
         }
         public static bool DrawVector2WithSlider(string label, ref Vector2 vec2, float lValue, float rValue) {
             bool result = false;
-            Drawer.Button($"<b>{label}</b>");
+            GUILayout.Label($"<b>{label}</b>");
             result |= DrawSingleWithSlider("X:", ref vec2.x, lValue, rValue, 300f);
             result |= DrawSingleWithSlider("Y:", ref vec2.y, lValue, rValue, 300f);
             return result;
         }
         public static bool DrawVector3WithSlider(string label, ref Vector3 vec3, float lValue, float rValue) {
             bool result = false;
-            Drawer.Button($"<b>{label}</b>");
+            GUILayout.Label($"<b>{label}</b>");
             result |= DrawSingleWithSlider("X:", ref vec3.x, lValue, rValue, 300f);
             result |= DrawSingleWithSlider("Y:", ref vec3.y, lValue, rValue, 300f);
             result |= DrawSingleWithSlider("Z:", ref vec3.z, lValue, rValue, 300f);
@@ -304,7 +304,7 @@ public static bool DrawPressReleaseBase<T>(string label, PressRelease<T> pr, Cus
             GUILayoutEx.ExpandableGUI((Action)(() => {
                 begin(emptyOptions);
                 {
-                    Drawer.Button(Main.Lang.Get("MISC_PRESSED", "Pressed"));
+                    GUILayout.Label(Main.Lang.Get("MISC_PRESSED", "Pressed"));
                     changed |= drawer(ref pr.Pressed);
                 }
                 end();
@@ -322,7 +322,7 @@ public static bool DrawPressReleaseBase<T>(string label, PressRelease<T> pr, Cus
 
                 begin(emptyOptions);
                 {
-                    Drawer.Button(Main.Lang.Get("MISC_RELEASED", "Released"));
+                    GUILayout.Label(Main.Lang.Get("MISC_RELEASED", "Released"));
                     changed |= drawer(ref pr.Released);
                 }
                 end();
@@ -376,7 +376,7 @@ public static bool DrawStringArray(ref string[] array, Action<int> arrayResized
             for(int i = 0; i < array.Length; i++) {
                 string cache = array[i];
                 GUILayout.BeginHorizontal();
-                Drawer.Button($"{i}: ");
+                GUILayout.Label($"{i}: ");
                 cache = GUILayout.TextField(cache);
                 elementRightGUI?.Invoke(i);
                 GUILayout.FlexibleSpace();
@@ -390,7 +390,7 @@ public static bool DrawStringArray(ref string[] array, Action<int> arrayResized
         }
         public static bool DrawArray(string label, ref object[] array) {
             bool result = false;
-            Drawer.Button(label);
+            GUILayout.Label(label);
             GUILayout.BeginVertical();
 
             GUILayout.BeginHorizontal();
@@ -608,7 +608,7 @@ public static bool DrawObject(string label, ref object obj) {
                     obj = str;
                     break;
                 default:
-                    Drawer.Button($"{label}{obj}");
+                    GUILayout.Label($"{label}{obj}");
                     break;
             }
             return result;
diff --git a/KeyViewer/Core/GUILayoutEx.cs b/KeyViewer/Core/GUILayoutEx.cs
@@ -52,7 +52,7 @@ public static void ExpandableGUI(Action enGui, Action disGui, Action onEnable, A
                 });
             if (!string.IsNullOrEmpty(desc))
             {
-                Drawer.Button("-");
+                GUILayout.Label("-");
                 GUILayout.Label(
                     desc,
                     new GUIStyle(GUI.skin.label) { fontStyle = FontStyle.Bold });
@@ -349,12 +349,12 @@ public static float NamedSliderContent(
         {
             if (labelWidth == 0)
             {
-                Drawer.Button(name);
+                GUILayout.Label(name);
                 GUILayout.Space(4f);
             }
             else
             {
-                Drawer.Button(name, GUILayout.Width(labelWidth));
+                GUILayout.Label(name, GUILayout.Width(labelWidth));
             }
             float newValue =
                 GUILayout.HorizontalSlider(
@@ -365,7 +365,7 @@ public static float NamedSliderContent(
             }
             GUILayout.Space(8f);
             if (valueFormat != "{0}")
-                Drawer.Button(string.Format(valueFormat, newValue));
+                GUILayout.Label(string.Format(valueFormat, newValue));
             else newValue = StringConverter.ToFloat(GUILayout.TextField(newValue.ToString("F4")));
             GUILayout.FlexibleSpace();
             return newValue;
@@ -439,12 +439,12 @@ private static string NamedTextFieldContent(
         {
             if (labelWidth == 0)
             {
-                Drawer.Button(name);
+                GUILayout.Label(name);
                 GUILayout.Space(4f);
             }
             else
             {
-                Drawer.Button(name, GUILayout.Width(labelWidth));
+                GUILayout.Label(name, GUILayout.Width(labelWidth));
             }
             string newValue = fieldWidth <= 0 ? GUILayout.TextField(value) : GUILayout.TextField(value, GUILayout.Width(fieldWidth));
             GUILayout.FlexibleSpace();
@@ -465,23 +465,23 @@ public static void LabelPair(string text1, string text2, float textWidth = 0)
             GUILayout.BeginHorizontal();
             if (textWidth == 0)
             {
-                Drawer.Button(text1);
+                GUILayout.Label(text1);
                 GUILayout.Space(4f);
             }
             else
             {
-                Drawer.Button(text1, GUILayout.Width(textWidth));
+                GUILayout.Label(text1, GUILayout.Width(textWidth));
             }
             GUILayout.FlexibleSpace();
             GUILayout.Space(8f);
             if (textWidth == 0)
             {
-                Drawer.Button(text2);
+                GUILayout.Label(text2);
                 GUILayout.Space(4f);
             }
             else
             {
-                Drawer.Button(text2, GUILayout.Width(textWidth));
+                GUILayout.Label(text2, GUILayout.Width(textWidth));
             }
             GUILayout.FlexibleSpace();
             GUILayout.Space(20f);
diff --git a/KeyViewer/Main.cs b/KeyViewer/Main.cs
@@ -142,7 +142,7 @@ public static void OnUpdate(ModEntry modEntry, float deltaTime)
         public static void OnGUI(ModEntry modEntry)
         {
             if (Lang.GetLoading())
-                Drawer.Button("Preparing...");
+                GUILayout.Label("Preparing...");
             else GUI.Draw();
         }
         public static void OnSaveGUI(ModEntry modEntry)
diff --git a/KeyViewer/Views/MultipleRainConfigDrawer.cs b/KeyViewer/Views/MultipleRainConfigDrawer.cs
@@ -56,15 +56,15 @@ public override void Draw()
 
             GUILayout.BeginHorizontal();
             {
-                Drawer.Button(FormatText(string.Format(Main.Lang.Get("RAINCONFIG_DIRECTION", "Key {0} Rain Direction"), name), "Direction"));
+                GUILayout.Label(FormatText(string.Format(Main.Lang.Get("RAINCONFIG_DIRECTION", "Key {0} Rain Direction"), name), "Direction"));
                 changed |= Drawer.DrawEnum(FormatText(string.Format(Main.Lang.Get("RAINCONFIG_DIRECTION", "Key {0} Rain Direction"), name), "Direction"), ref model.Direction).IfTrue(() => Set("Direction"));
             }
             GUILayout.FlexibleSpace();
             GUILayout.EndHorizontal();
 
             GUILayout.BeginHorizontal();
             {
-                Drawer.Button(FormatText(string.Format(Main.Lang.Get("RAINCONFIG_IMAGE_DISPLAY_MODE", "Key {0} Rain Image Display Mode"), name), "ImageDisplayMode"));
+                GUILayout.Label(FormatText(string.Format(Main.Lang.Get("RAINCONFIG_IMAGE_DISPLAY_MODE", "Key {0} Rain Image Display Mode"), name), "ImageDisplayMode"));
                 changed |= Drawer.DrawEnum(FormatText(string.Format(Main.Lang.Get("RAINCONFIG_IMAGE_DISPLAY_MODE", "Key {0} Rain Image Display Mode"), name), "ImageDisplayMode"), ref model.ImageDisplayMode).IfTrue(() => Set("ImageDisplayMode"));
             }
             GUILayout.FlexibleSpace();

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ public static void ExpandableGUI(Action enGui, Action disGui, Action onEnable, A`
`52`	`52`	`});`
`53`	`53`	`if (!string.IsNullOrEmpty(desc))`
`54`	`54`	`{`
`55`		`- Drawer.Button("-");`
	`55`	`+ GUILayout.Label("-");`
`56`	`56`	`GUILayout.Label(`
`57`	`57`	`desc,`
`58`	`58`	`new GUIStyle(GUI.skin.label) { fontStyle = FontStyle.Bold });`
`@@ -349,12 +349,12 @@ public static float NamedSliderContent(`
`349`	`349`	`{`
`350`	`350`	`if (labelWidth == 0)`
`351`	`351`	`{`
`352`		`- Drawer.Button(name);`
	`352`	`+ GUILayout.Label(name);`
`353`	`353`	`GUILayout.Space(4f);`
`354`	`354`	`}`
`355`	`355`	`else`
`356`	`356`	`{`
`357`		`- Drawer.Button(name, GUILayout.Width(labelWidth));`
	`357`	`+ GUILayout.Label(name, GUILayout.Width(labelWidth));`
`358`	`358`	`}`
`359`	`359`	`float newValue =`
`360`	`360`	`GUILayout.HorizontalSlider(`
`@@ -365,7 +365,7 @@ public static float NamedSliderContent(`
`365`	`365`	`}`
`366`	`366`	`GUILayout.Space(8f);`
`367`	`367`	`if (valueFormat != "{0}")`
`368`		`- Drawer.Button(string.Format(valueFormat, newValue));`
	`368`	`+ GUILayout.Label(string.Format(valueFormat, newValue));`
`369`	`369`	`else newValue = StringConverter.ToFloat(GUILayout.TextField(newValue.ToString("F4")));`
`370`	`370`	`GUILayout.FlexibleSpace();`
`371`	`371`	`return newValue;`
`@@ -439,12 +439,12 @@ private static string NamedTextFieldContent(`
`439`	`439`	`{`
`440`	`440`	`if (labelWidth == 0)`
`441`	`441`	`{`
`442`		`- Drawer.Button(name);`
	`442`	`+ GUILayout.Label(name);`
`443`	`443`	`GUILayout.Space(4f);`
`444`	`444`	`}`
`445`	`445`	`else`
`446`	`446`	`{`
`447`		`- Drawer.Button(name, GUILayout.Width(labelWidth));`
	`447`	`+ GUILayout.Label(name, GUILayout.Width(labelWidth));`
`448`	`448`	`}`
`449`	`449`	`string newValue = fieldWidth <= 0 ? GUILayout.TextField(value) : GUILayout.TextField(value, GUILayout.Width(fieldWidth));`
`450`	`450`	`GUILayout.FlexibleSpace();`
`@@ -465,23 +465,23 @@ public static void LabelPair(string text1, string text2, float textWidth = 0)`
`465`	`465`	`GUILayout.BeginHorizontal();`
`466`	`466`	`if (textWidth == 0)`
`467`	`467`	`{`
`468`		`- Drawer.Button(text1);`
	`468`	`+ GUILayout.Label(text1);`
`469`	`469`	`GUILayout.Space(4f);`
`470`	`470`	`}`
`471`	`471`	`else`
`472`	`472`	`{`
`473`		`- Drawer.Button(text1, GUILayout.Width(textWidth));`
	`473`	`+ GUILayout.Label(text1, GUILayout.Width(textWidth));`
`474`	`474`	`}`
`475`	`475`	`GUILayout.FlexibleSpace();`
`476`	`476`	`GUILayout.Space(8f);`
`477`	`477`	`if (textWidth == 0)`
`478`	`478`	`{`
`479`		`- Drawer.Button(text2);`
	`479`	`+ GUILayout.Label(text2);`
`480`	`480`	`GUILayout.Space(4f);`
`481`	`481`	`}`
`482`	`482`	`else`
`483`	`483`	`{`
`484`		`- Drawer.Button(text2, GUILayout.Width(textWidth));`
	`484`	`+ GUILayout.Label(text2, GUILayout.Width(textWidth));`
`485`	`485`	`}`
`486`	`486`	`GUILayout.FlexibleSpace();`
`487`	`487`	`GUILayout.Space(20f);`
Original file line number	Diff line number	Diff line change
`@@ -142,7 +142,7 @@ public static void OnUpdate(ModEntry modEntry, float deltaTime)`
`142`	`142`	`public static void OnGUI(ModEntry modEntry)`
`143`	`143`	`{`
`144`	`144`	`if (Lang.GetLoading())`
`145`		`- Drawer.Button("Preparing...");`
	`145`	`+ GUILayout.Label("Preparing...");`
`146`	`146`	`else GUI.Draw();`
`147`	`147`	`}`
`148`	`148`	`public static void OnSaveGUI(ModEntry modEntry)`
Original file line number	Diff line number	Diff line change
`@@ -56,15 +56,15 @@ public override void Draw()`
`56`	`56`
`57`	`57`	`GUILayout.BeginHorizontal();`
`58`	`58`	`{`
`59`		`- Drawer.Button(FormatText(string.Format(Main.Lang.Get("RAINCONFIG_DIRECTION", "Key {0} Rain Direction"), name), "Direction"));`
	`59`	`+ GUILayout.Label(FormatText(string.Format(Main.Lang.Get("RAINCONFIG_DIRECTION", "Key {0} Rain Direction"), name), "Direction"));`
`60`	`60`	`changed \|= Drawer.DrawEnum(FormatText(string.Format(Main.Lang.Get("RAINCONFIG_DIRECTION", "Key {0} Rain Direction"), name), "Direction"), ref model.Direction).IfTrue(() => Set("Direction"));`
`61`	`61`	`}`
`62`	`62`	`GUILayout.FlexibleSpace();`
`63`	`63`	`GUILayout.EndHorizontal();`
`64`	`64`
`65`	`65`	`GUILayout.BeginHorizontal();`
`66`	`66`	`{`
`67`		`- Drawer.Button(FormatText(string.Format(Main.Lang.Get("RAINCONFIG_IMAGE_DISPLAY_MODE", "Key {0} Rain Image Display Mode"), name), "ImageDisplayMode"));`
	`67`	`+ GUILayout.Label(FormatText(string.Format(Main.Lang.Get("RAINCONFIG_IMAGE_DISPLAY_MODE", "Key {0} Rain Image Display Mode"), name), "ImageDisplayMode"));`
`68`	`68`	`changed \|= Drawer.DrawEnum(FormatText(string.Format(Main.Lang.Get("RAINCONFIG_IMAGE_DISPLAY_MODE", "Key {0} Rain Image Display Mode"), name), "ImageDisplayMode"), ref model.ImageDisplayMode).IfTrue(() => Set("ImageDisplayMode"));`
`69`	`69`	`}`
`70`	`70`	`GUILayout.FlexibleSpace();`