From d1b2b64cd1a6fb0ce8efb523af112c789207671e Mon Sep 17 00:00:00 2001 From: nothingTVatYT Date: Sun, 15 Oct 2023 21:43:15 +0200 Subject: [PATCH 1/3] fix color picker (signal handler + alpha channel) --- Source/Editor/GUI/Dialogs/ColorPickerDialog.cs | 3 ++- Source/Editor/Utilities/ScreenUtilities.cpp | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Source/Editor/GUI/Dialogs/ColorPickerDialog.cs b/Source/Editor/GUI/Dialogs/ColorPickerDialog.cs index 161b3f4ae..efb262bd2 100644 --- a/Source/Editor/GUI/Dialogs/ColorPickerDialog.cs +++ b/Source/Editor/GUI/Dialogs/ColorPickerDialog.cs @@ -218,6 +218,7 @@ namespace FlaxEditor.GUI.Dialogs private void OnColorPicked(Color32 colorPicked) { + Editor.Log("OnColorPicked " + colorPicked + ", _active eye dropper=" + _activeEyedropper); if (_activeEyedropper) { _activeEyedropper = false; @@ -319,7 +320,7 @@ namespace FlaxEditor.GUI.Dialogs protected override void OnShow() { // Auto cancel on lost focus - ((WindowRootControl)Root).Window.LostFocus += OnCancel; + //((WindowRootControl)Root).Window.LostFocus += OnCancel; base.OnShow(); } diff --git a/Source/Editor/Utilities/ScreenUtilities.cpp b/Source/Editor/Utilities/ScreenUtilities.cpp index 44f52350e..730a69aa3 100644 --- a/Source/Editor/Utilities/ScreenUtilities.cpp +++ b/Source/Editor/Utilities/ScreenUtilities.cpp @@ -73,6 +73,7 @@ Color32 ScreenUtilities::GetColorAt(const Float2& pos) outputColor.R = color.red / 256; outputColor.G = color.green / 256; outputColor.B = color.blue / 256; + outputColor.A = 255; return outputColor; } From c42a264944f94db74fccbaed4ef1a9de156b88fe Mon Sep 17 00:00:00 2001 From: nothingTVatYT Date: Mon, 16 Oct 2023 01:08:47 +0200 Subject: [PATCH 2/3] removed a left over debug statement --- Source/Editor/GUI/Dialogs/ColorPickerDialog.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/Source/Editor/GUI/Dialogs/ColorPickerDialog.cs b/Source/Editor/GUI/Dialogs/ColorPickerDialog.cs index efb262bd2..4425813c0 100644 --- a/Source/Editor/GUI/Dialogs/ColorPickerDialog.cs +++ b/Source/Editor/GUI/Dialogs/ColorPickerDialog.cs @@ -218,7 +218,6 @@ namespace FlaxEditor.GUI.Dialogs private void OnColorPicked(Color32 colorPicked) { - Editor.Log("OnColorPicked " + colorPicked + ", _active eye dropper=" + _activeEyedropper); if (_activeEyedropper) { _activeEyedropper = false; From 48a5fe54e8f0d12f9237d90c4be7df2edc837f92 Mon Sep 17 00:00:00 2001 From: nothingTVatYT Date: Mon, 16 Oct 2023 01:13:06 +0200 Subject: [PATCH 3/3] keep auto-close for non-Linux platforms --- Source/Editor/GUI/Dialogs/ColorPickerDialog.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Source/Editor/GUI/Dialogs/ColorPickerDialog.cs b/Source/Editor/GUI/Dialogs/ColorPickerDialog.cs index 4425813c0..27878a763 100644 --- a/Source/Editor/GUI/Dialogs/ColorPickerDialog.cs +++ b/Source/Editor/GUI/Dialogs/ColorPickerDialog.cs @@ -319,7 +319,9 @@ namespace FlaxEditor.GUI.Dialogs protected override void OnShow() { // Auto cancel on lost focus - //((WindowRootControl)Root).Window.LostFocus += OnCancel; +#if !PLATFORM_LINUX + ((WindowRootControl)Root).Window.LostFocus += OnCancel; +#endif base.OnShow(); }