From 18fe6292a3a3e415b4ed7293665e2c6b4a95e657 Mon Sep 17 00:00:00 2001 From: AnnulusGames Date: Sun, 4 Feb 2024 10:53:25 +0900 Subject: [PATCH 1/3] Fix: readonly-field is not disabled for some types --- .../DebugUI/Runtime/DebugUIElementFactory.cs | 10 +++++----- .../Runtime/Internal/VisualElementHelper.cs | 15 --------------- .../Runtime/Internal/VisualElementHelper.cs.meta | 11 ----------- 3 files changed, 5 insertions(+), 31 deletions(-) delete mode 100644 src/DebugUI/Assets/DebugUI/Runtime/Internal/VisualElementHelper.cs delete mode 100644 src/DebugUI/Assets/DebugUI/Runtime/Internal/VisualElementHelper.cs.meta diff --git a/src/DebugUI/Assets/DebugUI/Runtime/DebugUIElementFactory.cs b/src/DebugUI/Assets/DebugUI/Runtime/DebugUIElementFactory.cs index bffdb03..aa8038f 100644 --- a/src/DebugUI/Assets/DebugUI/Runtime/DebugUIElementFactory.cs +++ b/src/DebugUI/Assets/DebugUI/Runtime/DebugUIElementFactory.cs @@ -68,7 +68,7 @@ public VisualElement CreateVisualElement(ICollection disposables) if (Setter == null) { - VisualElementHelper.SetInputFieldsEnabled(field, false); + field.SetEnabled(false); } else { @@ -109,7 +109,7 @@ public VisualElement CreateVisualElement(ICollection disposables) if (Setter == null) { - VisualElementHelper.SetInputFieldsEnabled(field, false); + field.SetEnabled(false); } else { @@ -228,7 +228,7 @@ public VisualElement CreateVisualElement(ICollection disposables) if (Setter == null) { - VisualElementHelper.SetInputFieldsEnabled(field, false); + field.SetEnabled(false); } else { @@ -263,7 +263,7 @@ public VisualElement CreateVisualElement(ICollection disposables) if (Setter == null) { - VisualElementHelper.SetInputFieldsEnabled(field, false); + field.SetEnabled(false); } else { @@ -299,7 +299,7 @@ public VisualElement CreateVisualElement(ICollection disposables) if (Setter == null) { - VisualElementHelper.SetInputFieldsEnabled(field, false); + field.SetEnabled(false); } else { diff --git a/src/DebugUI/Assets/DebugUI/Runtime/Internal/VisualElementHelper.cs b/src/DebugUI/Assets/DebugUI/Runtime/Internal/VisualElementHelper.cs deleted file mode 100644 index 30a937e..0000000 --- a/src/DebugUI/Assets/DebugUI/Runtime/Internal/VisualElementHelper.cs +++ /dev/null @@ -1,15 +0,0 @@ -using UnityEngine.UIElements; - -namespace DebugUI -{ - internal static class VisualElementHelper - { - public static void SetInputFieldsEnabled(VisualElement root, bool enabled) - { - foreach (var item in root.Query("unity-text-input").Build()) - { - item.SetEnabled(enabled); - } - } - } -} \ No newline at end of file diff --git a/src/DebugUI/Assets/DebugUI/Runtime/Internal/VisualElementHelper.cs.meta b/src/DebugUI/Assets/DebugUI/Runtime/Internal/VisualElementHelper.cs.meta deleted file mode 100644 index 90c4877..0000000 --- a/src/DebugUI/Assets/DebugUI/Runtime/Internal/VisualElementHelper.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 38a9cc4faf36741a6b1b3b08d5a1bbdd -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: From 7686f4ce725c0ce8970da012cb61d23921025a25 Mon Sep 17 00:00:00 2001 From: AnnulusGames Date: Sun, 4 Feb 2024 10:55:43 +0900 Subject: [PATCH 2/3] Add: uss selectors --- .../Assets/DebugUI/Package Resources/Debug UI.uss | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/src/DebugUI/Assets/DebugUI/Package Resources/Debug UI.uss b/src/DebugUI/Assets/DebugUI/Package Resources/Debug UI.uss index eea4f73..0d3fd13 100644 --- a/src/DebugUI/Assets/DebugUI/Package Resources/Debug UI.uss +++ b/src/DebugUI/Assets/DebugUI/Package Resources/Debug UI.uss @@ -265,6 +265,10 @@ -unity-background-image-tint-color: rgb(255, 255, 255); } +.unity-toggle__checkmark:disabled { + background-color: rgba(105, 105, 133, 0.8); +} + .unity-enum-field { padding-top: 1px; padding-bottom: 1px; @@ -295,6 +299,15 @@ margin-left: 0; } +.unity-enum-field__input:disabled { + background-color: rgba(105, 105, 133, 0.8); + height: 32px; + margin-top: 0; + margin-right: 0; + margin-bottom: 0; + margin-left: 0; +} + .unity-enum-field__text { color: rgb(255, 255, 255); } @@ -406,4 +419,4 @@ margin-right: 3px; margin-bottom: 3px; margin-left: 3px; -} \ No newline at end of file +} From 73064351fefe0d5878e5adffd323eef7abafa150 Mon Sep 17 00:00:00 2001 From: AnnulusGames Date: Sun, 4 Feb 2024 11:00:21 +0900 Subject: [PATCH 3/3] Fix: uss selector --- src/DebugUI/Assets/DebugUI/Package Resources/Debug UI.uss | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/DebugUI/Assets/DebugUI/Package Resources/Debug UI.uss b/src/DebugUI/Assets/DebugUI/Package Resources/Debug UI.uss index 0d3fd13..1000f65 100644 --- a/src/DebugUI/Assets/DebugUI/Package Resources/Debug UI.uss +++ b/src/DebugUI/Assets/DebugUI/Package Resources/Debug UI.uss @@ -248,6 +248,10 @@ margin-left: 0; } +.unity-toggle > .unity-toggle__input:disabled > .unity-toggle__checkmark { + background-color: rgba(105, 105, 133, 0.8); +} + .unity-toggle__checkmark { border-top-width: 0; border-right-width: 0; @@ -265,10 +269,6 @@ -unity-background-image-tint-color: rgb(255, 255, 255); } -.unity-toggle__checkmark:disabled { - background-color: rgba(105, 105, 133, 0.8); -} - .unity-enum-field { padding-top: 1px; padding-bottom: 1px;