diff options
| author | Max Hilbrunner <mhilbrunner@users.noreply.github.com> | 2018-07-10 22:12:05 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-10 22:12:05 +0200 |
| commit | 750aa9939432035cfafd9ae9cded87c2deb3a65b (patch) | |
| tree | 95714b495b78e0ddb0fb52a05cdd73df367cad4f | |
| parent | b69422162d5039d0aeee4957c9d85c29ad034c6c (diff) | |
| parent | bf3c81f20b5c0a0d7d5b044bc56a183b628fce80 (diff) | |
Merge pull request #20083 from AlexHolly/fix-colorpickerbutton-popup
fix ColorPickerButton.get_popup()
| -rw-r--r-- | scene/gui/color_picker.cpp | 3 | ||||
| -rw-r--r-- | scene/gui/color_picker.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/scene/gui/color_picker.cpp b/scene/gui/color_picker.cpp index f8c188d33d..8e232c6f46 100644 --- a/scene/gui/color_picker.cpp +++ b/scene/gui/color_picker.cpp @@ -743,8 +743,9 @@ ColorPicker *ColorPickerButton::get_picker() { return picker; } -PopupPanel *ColorPickerButton::get_popup() const { +PopupPanel *ColorPickerButton::get_popup() { + _update_picker(); return popup; } diff --git a/scene/gui/color_picker.h b/scene/gui/color_picker.h index c8d8e1aa8a..0166da7118 100644 --- a/scene/gui/color_picker.h +++ b/scene/gui/color_picker.h @@ -144,7 +144,7 @@ public: bool is_editing_alpha() const; ColorPicker *get_picker(); - PopupPanel *get_popup() const; + PopupPanel *get_popup(); ColorPickerButton(); }; |