asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #20083 from AlexHolly/fix-colorpickerbutton-popup

Browse source 
fix ColorPickerButton.get_popup()
This commit is contained in:
Max Hilbrunner 2018-07-10 22:12:05 +02:00 committed by GitHub
commit 750aa99394
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
scene/gui/color_picker.cpp
View file

@ -743,8 +743,9 @@ ColorPicker *ColorPickerButton::get_picker() {
return picker; return picker;
} }
PopupPanel *ColorPickerButton::get_popup() const { PopupPanel *ColorPickerButton::get_popup() {
_update_picker();
return popup; return popup;
} }

2
scene/gui/color_picker.h
View file

@ -144,7 +144,7 @@ public:
bool is_editing_alpha() const; bool is_editing_alpha() const;
ColorPicker *get_picker(); ColorPicker *get_picker();
PopupPanel *get_popup() const; PopupPanel *get_popup();
ColorPickerButton(); ColorPickerButton();
}; };