diff options
| author | Nils ANDRÉ-CHANG <nils@nilsand.re> | 2019-09-12 21:28:49 +0100 |
|---|---|---|
| committer | Nils ANDRÉ-CHANG <nils@nilsand.re> | 2019-09-26 20:36:12 +0100 |
| commit | 0024dd7bb5a8a5194ed0283fc506edcd8b4a7737 (patch) | |
| tree | 86316cccbf4fda58a275a7451e37fda83465bb20 /scene/gui/control.h | |
| parent | cafb888361eba08297dd88b18dc71f4d418525c0 (diff) | |
| parent | 24e1039eb6fe32115e8d1a62a84965e9be19a2ed (diff) | |
Merge branch 'master' into tab_key
Diffstat (limited to 'scene/gui/control.h')
| -rw-r--r-- | scene/gui/control.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/scene/gui/control.h b/scene/gui/control.h index 1a59a6d2e4..7305b3ce93 100644 --- a/scene/gui/control.h +++ b/scene/gui/control.h @@ -38,9 +38,6 @@ #include "scene/main/node.h" #include "scene/main/timer.h" #include "scene/resources/theme.h" -/** - @author Juan Linietsky <reduzio@gmail.com> -*/ class Viewport; class Label; @@ -230,7 +227,6 @@ private: void _update_scroll(); void _resize(const Size2 &p_size); - Rect2 _compute_child_rect(const float p_anchors[4], const float p_margins[4]) const; void _compute_margins(Rect2 p_rect, const float p_anchors[4], float (&r_margins)[4]); void _compute_anchors(Rect2 p_rect, const float p_margins[4], float (&r_anchors)[4]); |