diff --git a/src/Debug/Editor/SettingsPrefs.cs b/src/Debug/Editor/SettingsPrefs.cs index c81dad2..35b2b93 100644 --- a/src/Debug/Editor/SettingsPrefs.cs +++ b/src/Debug/Editor/SettingsPrefs.cs @@ -101,7 +101,6 @@ namespace DCFApixels.DragonECS.Unity.Editors private void AutoSave() { Save(true); - Debug.Log("AutoSave"); } } } diff --git a/src/DragonDocs/DragonDocsMeta.cs b/src/DragonDocs/DragonDocsMeta.cs index 17cf780..4d1cee0 100644 --- a/src/DragonDocs/DragonDocsMeta.cs +++ b/src/DragonDocs/DragonDocsMeta.cs @@ -17,7 +17,7 @@ namespace DCFApixels.DragonECS.Unity.Docs [DataMember, SerializeField] internal string _name = string.Empty; [DataMember, SerializeField] internal bool _isCustomName = false; [DataMember, SerializeField] internal string _typeName = string.Empty; - [DataMember, SerializeField] internal MetaColor _color = MetaColor.BlackColor; + [DataMember, SerializeField] internal Color32 _color = new Color32(0, 0, 0, 255); [DataMember, SerializeField] internal bool _isCustomColor = false; [DataMember, SerializeField] internal string _autor = string.Empty; [DataMember, SerializeField] internal string _description = string.Empty; @@ -48,7 +48,7 @@ namespace DCFApixels.DragonECS.Unity.Docs { get { return _typeName; } } - public MetaColor Color + public Color32 Color { get { return _color; } } @@ -86,7 +86,7 @@ namespace DCFApixels.DragonECS.Unity.Docs _name = meta.Name; _isCustomName = meta.IsCustomName; _typeName = meta.TypeName; - _color = meta.Color; + _color = meta.Color.ToUnityColor32(); _isCustomColor = meta.IsCustomColor; _autor = meta.Description.Author; diff --git a/src/DragonDocs/Editors/DragonDocsWindow.cs b/src/DragonDocs/Editors/DragonDocsWindow.cs index c84b3a6..9612a75 100644 --- a/src/DragonDocs/Editors/DragonDocsWindow.cs +++ b/src/DragonDocs/Editors/DragonDocsWindow.cs @@ -136,7 +136,7 @@ namespace DCFApixels.DragonECS.Unity.Docs.Editors GUILayout.Label(""); EditorGUI.BeginChangeCheck(); - _searchingSampleEnter = EditorGUILayout.TextField(_searchingSampleEnter, EditorStyles.toolbarTextField, GUILayout.ExpandHeight(true), GUILayout.MaxWidth(200f)); + _searchingSampleEnter = EditorGUILayout.TextField(_searchingSampleEnter, EditorStyles.toolbarSearchField, GUILayout.ExpandHeight(true), GUILayout.MaxWidth(200f)); if (EditorGUI.EndChangeCheck()) { _searchingSampleChanged = true; @@ -233,7 +233,6 @@ namespace DCFApixels.DragonECS.Unity.Docs.Editors i++; } } - if (iMax <= 0) { GUILayout.Label(info.Length <= 0 ? "empty group" : "there are hidden items", EditorStyles.centeredGreyMiniLabel, GUILayout.ExpandHeight(true), GUILayout.ExpandWidth(true)); @@ -244,7 +243,7 @@ namespace DCFApixels.DragonECS.Unity.Docs.Editors { using (EcsGUI.SetIndentLevel(0)) { - Color panelColor = EcsGUI.SelectPanelColor(meta.Color, meta.IsCustomColor, index, total).Desaturate(EscEditorConsts.COMPONENT_DRAWER_DESATURATE); + Color panelColor = EcsGUI.SelectPanelColor(meta.Color.ToMetaColor(), meta.IsCustomColor, index, total).Desaturate(EscEditorConsts.COMPONENT_DRAWER_DESATURATE); Color alphaPanelColor = panelColor; alphaPanelColor.a = EscEditorConsts.COMPONENT_DRAWER_ALPHA; diff --git a/src/Utils/MetaColorExstensions.cs b/src/Utils/MetaColorExstensions.cs index 18238e6..259aeb0 100644 --- a/src/Utils/MetaColorExstensions.cs +++ b/src/Utils/MetaColorExstensions.cs @@ -12,5 +12,15 @@ namespace DCFApixels.DragonECS { return new Color32(self.R, self.G, self.B, self.A); } + + public static MetaColor ToMetaColor(this Color self) + { + return new MetaColor((byte)(self.r * 255), (byte)(self.g * 255), (byte)(self.b * 255), (byte)(self.a * 255)); + } + + public static MetaColor ToMetaColor(this Color32 self) + { + return new MetaColor(self.r, self.g, self.b, self.a); + } } }