Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-12-07 22:00:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #101960 from Giganzo/colorpicker-swatches-menubutton

Browse source 
Fix ColorPicker load/save swatches button interactions
This commit is contained in:
Thaddeus Crews 2025-01-31 09:15:37 -06:00
commit 00564920d8
No known key found for this signature in database
GPG key ID: 62181B86FE9E5D84
2 changed files with 6 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

3
scene/gui/color_picker.h
View file

@ -144,7 +144,7 @@ private:
TextureRect *picker_texture_rect = nullptr;
Color picker_color;
FileDialog *file_dialog = nullptr;
Button *menu_btn = nullptr;
MenuButton *menu_btn = nullptr;
PopupMenu *options_menu = nullptr;
MarginContainer *internal_margin = nullptr;
@ -306,7 +306,6 @@ private:
void _target_gui_input(const Ref<InputEvent> &p_event);
void _pick_finished();
void _update_menu_items();
void _update_menu();
void _options_menu_cbk(int p_which);
// Legacy color picking.