Fix overwriting built in editor styles and improve dark theme support

oneVR · Oct 5, 2020 · bb96fc6 · bb96fc6
1 parent d337d58
commit bb96fc6
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 28 deletions.
diff --git a/Scripts/Editor/BuildReportTreeView.cs b/Scripts/Editor/BuildReportTreeView.cs
@@ -4,11 +4,9 @@
 using System.Linq;
 using UnityEditor;
 using UnityEditor.Build.Reporting;
-using UnityEditor.Callbacks;
 using UnityEditor.IMGUI.Controls;
 using UnityEngine;
-using UnityEngine.Assertions;
-using UnityEngine.EventSystems;
+using VRWorldToolkit.DataStructures;
 
 namespace VRWorldToolkit
 {
@@ -327,12 +325,10 @@ protected override void RowGUI(RowGUIArgs args)
                 var rect = args.GetCellRect(visibleColumnIndex);
                 var columnIndex = (TreeColumns)args.GetColumn(visibleColumnIndex);
 
-                // Set label style to white if cell is selected if selected
-                var labelStyle = args.selected ? EditorStyles.whiteLabel : EditorStyles.label;
-                labelStyle.alignment = TextAnchor.MiddleLeft;
-                labelStyle.wordWrap = false;
+                //Set label style to white if cell is selected otherwise to normal
+                var labelStyle = args.selected ? Styles.TreeViewLabelSelected : Styles.TreeViewLabel;
 
-                // Handle drawing of the columns
+                //Handle drawing of the columns
                 switch (columnIndex)
                 {
                     case TreeColumns.Type:

diff --git a/Scripts/Editor/VRWTAbout.cs b/Scripts/Editor/VRWTAbout.cs
@@ -1,5 +1,6 @@
 using UnityEditor;
 using UnityEngine;
+using VRWorldToolkit.DataStructures;
 
 namespace VRWorldToolkit
 {
@@ -30,17 +31,12 @@ public void OnEnable()
                 fixedHeight = 140
             };
 
-            Text = new GUIStyle
+            Text = new GUIStyle("Label")
             {
-                padding = new RectOffset(5, 5, 5, 5),
                 wordWrap = true,
                 richText = true
             };
 
-            // Set text to white on black theme for readability
-            if (EditorGUIUtility.isProSkin)
-                Text.normal.textColor = Color.white;
-
             IconTwitter = Resources.Load("SplashTextures/IconTwitter") as Texture2D;
             IconDiscord = Resources.Load("SplashTextures/IconDiscord") as Texture2D;
             IconGithub = Resources.Load("SplashTextures/IconGithub") as Texture2D;

diff --git a/Scripts/Editor/VRWTDataStructures.cs b/Scripts/Editor/VRWTDataStructures.cs
@@ -6,10 +6,13 @@ public static class Styles
     {
         public static GUIStyle HelpBoxRichText { get; internal set; }
         public static GUIStyle HelpBoxPadded { get; internal set; }
+        public static GUIStyle LabelRichText { get; internal set; }
         public static GUIStyle RichText { get; internal set; }
         public static GUIStyle RichTextWrap { get; internal set; }
         public static GUIStyle RedLabel { get; internal set; }
         public static GUIStyle WhiteLabel { get; internal set; }
+        public static GUIStyle TreeViewLabel { get; internal set; }
+        public static GUIStyle TreeViewLabelSelected { get; internal set; }
 
         static Styles()
         {
@@ -30,6 +33,12 @@ static void Reload()
                 richText = true
             };
 
+            LabelRichText = new GUIStyle("Label")
+            {
+                richText = true,
+                margin = new RectOffset(5, 5, 0, 0),
+            };
+
             RichText = new GUIStyle
             {
                 richText = true
@@ -41,8 +50,25 @@ static void Reload()
                 wordWrap = true
             };
 
-            RedLabel = new GUIStyle { };
-            RedLabel.normal.textColor = Color.red;
+            RedLabel = new GUIStyle
+            {
+                normal =
+                {
+                    textColor = Color.red,
+                },
+            };
+
+            TreeViewLabel = new GUIStyle("Label")
+            {
+                alignment = TextAnchor.MiddleLeft,
+                wordWrap = false,
+            };
+
+            TreeViewLabelSelected = new GUIStyle("WhiteLabel")
+            {
+                alignment = TextAnchor.MiddleLeft,
+                wordWrap = false,
+            };
         }
     }
 }
diff --git a/Scripts/Editor/WorldDebugger.cs b/Scripts/Editor/WorldDebugger.cs
@@ -2249,26 +2249,19 @@ private void RefreshBuild()
 
         private void DrawBuildSummary(BuildReport report)
         {
-            var richText = Styles.RichText;
-
-            if (EditorGUIUtility.isProSkin)
-            {
-                richText.normal.textColor = Color.white;
-            }
-
             GUILayout.BeginVertical(EditorStyles.helpBox);
 
             if (report != null)
             {
-                GUILayout.Label("<b>Build size:</b> " + EditorUtility.FormatBytes((long)report.summary.totalSize), richText);
+                GUILayout.Label("<b>Build size:</b> " + EditorUtility.FormatBytes((long)report.summary.totalSize), Styles.LabelRichText);
 
-                GUILayout.Label("<b>Build done:</b> " + report.summary.buildEndedAt.ToLocalTime(), richText);
+                GUILayout.Label("<b>Build done:</b> " + report.summary.buildEndedAt.ToLocalTime(), Styles.LabelRichText);
 
-                GUILayout.Label("<b>Errors during build:</b> " + report.summary.totalErrors.ToString(), richText);
+                GUILayout.Label("<b>Errors during build:</b> " + report.summary.totalErrors.ToString(), Styles.LabelRichText);
 
-                GUILayout.Label("<b>Warnings during build:</b> " + report.summary.totalWarnings.ToString(), richText);
+                GUILayout.Label("<b>Warnings during build:</b> " + report.summary.totalWarnings.ToString(), Styles.LabelRichText);
 
-                GUILayout.Label("<b>Build result:</b> " + report.summary.result, richText);
+                GUILayout.Label("<b>Build result:</b> " + report.summary.result, Styles.LabelRichText);
             }
 
             GUILayout.EndVertical();