Adding collections background color in global settings

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

View File

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

View File

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

View File

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

View File

@@ -1,6 +1,7 @@
// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved. // Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.
using System; using System;
using FlaxEngine.GUI;
namespace FlaxEngine namespace FlaxEngine
{ {
@@ -36,8 +37,8 @@ namespace FlaxEngine
public float Spacing; public float Spacing;
/// <summary> /// <summary>
/// Background color of the collection. /// The collection background color.
/// </summary> /// </summary>
public Color BackgroundColor = new Color(1f, 1f, 1f, 0.08f); public Color BackgroundColor = Style.Current.CollectionBackgroundColor;
} }
} }

View File

@@ -221,6 +221,7 @@ namespace FlaxEngine
TextBoxBackground = Color.FromBgra(0xFF333337), TextBoxBackground = Color.FromBgra(0xFF333337),
ProgressNormal = Color.FromBgra(0xFF0ad328), ProgressNormal = Color.FromBgra(0xFF0ad328),
TextBoxBackgroundSelected = Color.FromBgra(0xFF3F3F46), TextBoxBackgroundSelected = Color.FromBgra(0xFF3F3F46),
CollectionBackgroundColor = Color.FromBgra(0x16FFFFFF),
SharedTooltip = new Tooltip(), SharedTooltip = new Tooltip(),
}; };
style.DragWindow = style.BackgroundSelected * 0.7f; style.DragWindow = style.BackgroundSelected * 0.7f;

View File

@@ -152,6 +152,11 @@ namespace FlaxEngine.GUI
[EditorOrder(190)] [EditorOrder(190)]
public Color TextBoxBackgroundSelected; public Color TextBoxBackgroundSelected;
/// <summary>
/// The collection background color.
/// </summary>
[EditorOrder(195)]
public Color CollectionBackgroundColor;
/// <summary> /// <summary>
/// The progress normal color. /// The progress normal color.
/// </summary> /// </summary>