From 4a6afdb1089f8b6dfda24d16e9c8df57e1928baf Mon Sep 17 00:00:00 2001 From: Chandler Cox Date: Tue, 7 May 2024 08:41:23 -0500 Subject: [PATCH] Small fixes for color picker. --- Source/Editor/GUI/Dialogs/ColorPickerDialog.cs | 2 ++ Source/Editor/GUI/Dialogs/ColorSelector.cs | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Source/Editor/GUI/Dialogs/ColorPickerDialog.cs b/Source/Editor/GUI/Dialogs/ColorPickerDialog.cs index 2ef9fdecd..714f5a0b3 100644 --- a/Source/Editor/GUI/Dialogs/ColorPickerDialog.cs +++ b/Source/Editor/GUI/Dialogs/ColorPickerDialog.cs @@ -264,6 +264,7 @@ namespace FlaxEditor.GUI.Dialogs { Text = "+", Parent = this, + TooltipText = "Save Color.", Tag = null, }; savedColorButton.ButtonClicked += (b) => OnSavedColorButtonClicked(b); @@ -498,6 +499,7 @@ namespace FlaxEditor.GUI.Dialogs { Text = "+", Parent = this, + TooltipText = "Save Color.", Tag = null, }; savedColorButton.ButtonClicked += (b) => OnSavedColorButtonClicked(b); diff --git a/Source/Editor/GUI/Dialogs/ColorSelector.cs b/Source/Editor/GUI/Dialogs/ColorSelector.cs index 646bfe41a..d729ec571 100644 --- a/Source/Editor/GUI/Dialogs/ColorSelector.cs +++ b/Source/Editor/GUI/Dialogs/ColorSelector.cs @@ -311,7 +311,9 @@ namespace FlaxEditor.GUI.Dialogs // Alpha float alphaY = _slider2Rect.Height * (1 - _color.A); var alphaR = new Rectangle(_slider2Rect.X - slidersOffset, _slider2Rect.Y + alphaY - slidersThickness / 2, _slider2Rect.Width + slidersOffset * 2, slidersThickness); - Render2D.FillRectangle(_slider2Rect, _color, _color, Color.Transparent, Color.Transparent); + var color = _color; + color.A = 1; // Keep slider 2 fill rect from changing color alpha while selecting. + Render2D.FillRectangle(_slider2Rect, color, color, Color.Transparent, Color.Transparent); Render2D.DrawRectangle(_slider2Rect, _isMouseDownSlider2 ? style.BackgroundSelected : Color.Black); Render2D.DrawRectangle(alphaR, _isMouseDownSlider2 ? Color.White : Color.Gray); }