summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Holland <alexander.holland@live.de>2018-07-10 15:06:36 +0200
committerAlexander Holland <alexander.holland@live.de>2018-07-10 15:06:36 +0200
commitbf3c81f20b5c0a0d7d5b044bc56a183b628fce80 (patch)
treee08aaac015f1e2289864be7bae196197cb13dae8
parent04d9f8dbd6b1ec517c2d66db19efa93517933232 (diff)
fix ColorPickerButton.get_popup()
-rw-r--r--scene/gui/color_picker.cpp3
-rw-r--r--scene/gui/color_picker.h2
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();
};