GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions 7 Packages Projects Releases Wiki Activity

Adding collections background color in global settings

Browse Source
This commit is contained in:
Crawcik
2021-06-03 14:29:42 +02:00
parent e459707b0d
commit 9b55ffdf6c
6 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Editor/CustomEditors/Editors/CollectionEditor.cs
View File

@@ -126,7 +126,7 @@ namespace FlaxEditor.CustomEditors.Editors
{
_readOnly = false;
NotNullItems = false;
_background = new Color(1f, 1f, 1f, 0.08f);
_background = FlaxEngine.GUI.Style.Current.CollectionBackgroundColor;
}
else
{

14
Source/Editor/CustomEditors/Editors/DictionaryEditor.cs
View File

@@ -1,5 +1,9 @@
// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.
using System;
using System.Collections;
using System.Collections.Generic;
using System.Linq;
using FlaxEditor.CustomEditors.Elements;
using FlaxEditor.CustomEditors.GUI;
using FlaxEditor.GUI;
@@ -8,10 +12,6 @@ using FlaxEditor.Scripting;
using FlaxEngine;
using FlaxEngine.GUI;
using FlaxEngine.Json;
using System;
using System.Collections;
using System.Collections.Generic;
using System.Linq;
namespace FlaxEditor.CustomEditors.Editors
{
@@ -186,15 +186,13 @@ namespace FlaxEditor.CustomEditors.Editors
var collection = (CollectionAttribute)attributes.FirstOrDefault(x => x is CollectionAttribute);
if (collection is null)
{
// TODO: handle ReadOnly and NotNullItems by filtering child editors SetValue
_readOnly = false;
_notNullItems = false;
_background = new Color(1f, 1f, 1f, 0.08f);
_background = FlaxEngine.GUI.Style.Current.CollectionBackgroundColor;
}
else
{
// TODO: handle ReadOnly and NotNullItems by filtering child editors SetValue
_readOnly = collection.ReadOnly;
_notNullItems = collection.NotNullItems;
_background = collection.BackgroundColor;

1
Source/Editor/Options/OptionsModule.cs
View File

@@ -232,6 +232,7 @@ namespace FlaxEditor.Options
BorderNormal = Color.FromBgra(0xFF54545C),
TextBoxBackground = Color.FromBgra(0xFF333337),
TextBoxBackgroundSelected = Color.FromBgra(0xFF3F3F46),
CollectionBackgroundColor = Color.FromBgra(0x16FFFFFF),
ProgressNormal = Color.FromBgra(0xFF0ad328),
// Fonts