diff options
Diffstat (limited to 'scene/gui/control.h')
| -rw-r--r-- | scene/gui/control.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/scene/gui/control.h b/scene/gui/control.h index c52e80fa70..10d6ad168f 100644 --- a/scene/gui/control.h +++ b/scene/gui/control.h @@ -33,8 +33,8 @@ #include "core/math/transform_2d.h" #include "core/rid.h" -#include "scene/2d/canvas_item.h" #include "scene/gui/shortcut.h" +#include "scene/main/canvas_item.h" #include "scene/main/node.h" #include "scene/main/timer.h" #include "scene/resources/theme.h" @@ -44,7 +44,6 @@ class Label; class Panel; class Control : public CanvasItem { - GDCLASS(Control, CanvasItem); OBJ_CATEGORY("GUI Nodes"); @@ -132,17 +131,16 @@ public: private: struct CComparator { - bool operator()(const Control *p_a, const Control *p_b) const { - if (p_a->get_canvas_layer() == p_b->get_canvas_layer()) + if (p_a->get_canvas_layer() == p_b->get_canvas_layer()) { return p_b->is_greater_than(p_a); + } return p_a->get_canvas_layer() < p_b->get_canvas_layer(); } }; struct Data { - Point2 pos_cache; Size2 size_cache; Size2 minimum_size_cache; |