godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-12-02 16:48:55 +00:00
Code Releases Wiki Activity

Merge pull request #98428 from pafuent/fixing_color_picker_closing_popup_on_mouse_click

Browse Source 
Fix `ColorPickerButton` close popup on mouse click
This commit is contained in:
Thaddeus Crews
2025-11-20 16:47:08 -06:00
parent cb1569345a 2ef3ebf934
commit b79fe2e020
2 changed files with 23 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
scene/gui/color_picker.cpp
View File

@@ -2349,6 +2349,14 @@ void ColorPickerButton::_modal_closed() {
void ColorPickerButton::pressed() { void ColorPickerButton::pressed() {
_update_picker(); _update_picker();
// Checking if the popup was open before, so we can keep it closed instead of reopening it.
// Popups get closed when it's clicked outside of them.
if (popup_was_open) {
// Reset popup_was_open value.
popup_was_open = popup->is_visible();
return;
}
Size2 minsize = popup->get_contents_minimum_size(); Size2 minsize = popup->get_contents_minimum_size();
float viewport_height = get_viewport_rect().size.y; float viewport_height = get_viewport_rect().size.y;
@@ -2374,6 +2382,19 @@ void ColorPickerButton::pressed() {
} }
} }
void ColorPickerButton::gui_input(const Ref<InputEvent> &p_event) {
ERR_FAIL_COND(p_event.is_null());
Ref<InputEventMouseButton> mouse_button = p_event;
bool ui_accept = p_event->is_action("ui_accept", true) && !p_event->is_echo();
bool mouse_left_pressed = mouse_button.is_valid() && mouse_button->get_button_index() == MouseButton::LEFT && mouse_button->is_pressed();
if (mouse_left_pressed || ui_accept) {
popup_was_open = popup && popup->is_visible();
}
BaseButton::gui_input(p_event);
}
void ColorPickerButton::_notification(int p_what) { void ColorPickerButton::_notification(int p_what) {
switch (p_what) { switch (p_what) {
case NOTIFICATION_ACCESSIBILITY_UPDATE: { case NOTIFICATION_ACCESSIBILITY_UPDATE: {

2
scene/gui/color_picker.h
View File

@@ -514,6 +514,7 @@ class ColorPickerButton : public Button {
Color color; Color color;
bool edit_alpha = true; bool edit_alpha = true;
bool edit_intensity = true; bool edit_intensity = true;
bool popup_was_open = false;
struct ThemeCache { struct ThemeCache {
Ref<StyleBox> normal_style; Ref<StyleBox> normal_style;
@@ -533,6 +534,7 @@ class ColorPickerButton : public Button {
protected: protected:
void _notification(int); void _notification(int);
static void _bind_methods(); static void _bind_methods();
virtual void gui_input(const Ref<InputEvent> &p_event) override;
public: public:
void set_pick_color(const Color &p_color); void set_pick_color(const Color &p_color);