summaryrefslogtreecommitdiff
path: root/scene/main
diff options
context:
space:
mode:
authorMarkus Sauermann <6299227+Sauermann@users.noreply.github.com>2022-04-01 21:18:16 +0200
committerMarkus Sauermann <6299227+Sauermann@users.noreply.github.com>2022-11-02 21:45:00 +0100
commit022d24a9aef8aabd91dbef7fa6b01687748f78b6 (patch)
treec567dde5ea66db5065b44ec3db1ff60e0e46cf51 /scene/main
parent754552b34d3523a76656940145bd37328536292d (diff)
Fix Viewport root order after Node2D raise
Diffstat (limited to 'scene/main')
-rw-r--r--scene/main/canvas_layer.cpp2
-rw-r--r--scene/main/viewport.cpp2
-rw-r--r--scene/main/viewport.h4
3 files changed, 4 insertions, 4 deletions
diff --git a/scene/main/canvas_layer.cpp b/scene/main/canvas_layer.cpp
index be5788739b..5fde18721a 100644
--- a/scene/main/canvas_layer.cpp
+++ b/scene/main/canvas_layer.cpp
@@ -38,7 +38,7 @@ void CanvasLayer::set_layer(int p_xform) {
layer = p_xform;
if (viewport.is_valid()) {
RenderingServer::get_singleton()->viewport_set_canvas_stacking(viewport, canvas, layer, get_index());
- vp->_gui_set_root_order_dirty();
+ vp->gui_set_root_order_dirty();
}
}
diff --git a/scene/main/viewport.cpp b/scene/main/viewport.cpp
index 2385e4f54a..a40e8245db 100644
--- a/scene/main/viewport.cpp
+++ b/scene/main/viewport.cpp
@@ -2094,7 +2094,7 @@ List<Control *>::Element *Viewport::_gui_add_root_control(Control *p_control) {
return gui.roots.push_back(p_control);
}
-void Viewport::_gui_set_root_order_dirty() {
+void Viewport::gui_set_root_order_dirty() {
gui.roots_order_dirty = true;
}
diff --git a/scene/main/viewport.h b/scene/main/viewport.h
index 8911aea335..aec768e9a7 100644
--- a/scene/main/viewport.h
+++ b/scene/main/viewport.h
@@ -455,8 +455,6 @@ private:
void _update_canvas_items(Node *p_node);
- void _gui_set_root_order_dirty();
-
friend class Window;
void _sub_window_update_order();
@@ -513,6 +511,8 @@ public:
Transform2D get_final_transform() const;
+ void gui_set_root_order_dirty();
+
void set_transparent_background(bool p_enable);
bool has_transparent_background() const;