aboutsummaryrefslogtreecommitdiff
path: root/scene/gui/popup.cpp
diff options
context:
space:
mode:
authorJuan Linietsky2017-01-13 10:45:50 -0300
committerJuan Linietsky2017-01-13 10:45:50 -0300
commit04c749a1f034c0b2256fdca0ca2675f696b490e8 (patch)
treec908a64edf3f61bba725051c8f60c6a108acbb84 /scene/gui/popup.cpp
parenta2903fc51d1d20eba4dc451bdacbe477d6670163 (diff)
downloadgodot-04c749a1f034c0b2256fdca0ca2675f696b490e8.tar.gz
godot-04c749a1f034c0b2256fdca0ca2675f696b490e8.tar.zst
godot-04c749a1f034c0b2256fdca0ca2675f696b490e8.zip
New API for visibility in both CanvasItem and Spatial
visible (property) - access set_visible(bool) is_visible() is_visible_in_tree() - true when visible and parents visible show() hide() - for convenience
Diffstat (limited to 'scene/gui/popup.cpp')
-rw-r--r--scene/gui/popup.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/scene/gui/popup.cpp b/scene/gui/popup.cpp
index 5126568e5..3f0f76f18 100644
--- a/scene/gui/popup.cpp
+++ b/scene/gui/popup.cpp
@@ -39,7 +39,7 @@ void Popup::_gui_input(InputEvent p_event) {
void Popup::_notification(int p_what) {
if (p_what==NOTIFICATION_VISIBILITY_CHANGED) {
- if (popped_up && !is_visible()) {
+ if (popped_up && !is_visible_in_tree()) {
popped_up=false;
notification(NOTIFICATION_POPUP_HIDE);
emit_signal("popup_hide");
@@ -103,7 +103,7 @@ void Popup::set_as_minsize() {
Control *c=get_child(i)->cast_to<Control>();
if (!c)
continue;
- if (c->is_hidden())
+ if (!c->is_visible())
continue;
Size2 minsize = c->get_combined_minimum_size();
@@ -144,7 +144,7 @@ void Popup::popup_centered_minsize(const Size2& p_minsize) {
Control *c=get_child(i)->cast_to<Control>();
if (!c)
continue;
- if (c->is_hidden())
+ if (!c->is_visible())
continue;
Size2 minsize = c->get_combined_minimum_size();
@@ -283,7 +283,7 @@ Popup::Popup() {
String Popup::get_configuration_warning() const {
- if (is_visible()) {
+ if (is_visible_in_tree()) {
return TTR("Popups will hide by default unless you call popup() or any of the popup*() functions. Making them visible for editing is fine though, but they will hide upon running.");
}