Fixes the bad calculation of margin & anchors when child of Node2D

14 files changed, 77 insertions, 77 deletions

diff --git a/scene/2d/animated_sprite.cpp b/scene/2d/animated_sprite.cpp
index 54194ff543..e3d1592be0 100644
--- a/scene/2d/animated_sprite.cpp
+++ b/scene/2d/animated_sprite.cpp
@@ -59,15 +59,36 @@ bool AnimatedSprite::_edit_use_pivot() const {
 }
 
 Rect2 AnimatedSprite::_edit_get_rect() const {
+	return _get_rect();
+}
+
+bool AnimatedSprite::_edit_use_rect() const {
 	if (!frames.is_valid() || !frames->has_animation(animation) || frame < 0 || frame >= frames->get_frame_count(animation)) {
-		return Node2D::_edit_get_rect();
+		return false;
+	}
+	Ref<Texture> t;
+	if (animation)
+		t = frames->get_frame(animation, frame);
+	if (t.is_null())
+		return false;
+
+	return true;
+}
+
+Rect2 AnimatedSprite::get_anchorable_rect() const {
+	return _get_rect();
+}
+
+Rect2 AnimatedSprite::_get_rect() const {
+	if (!frames.is_valid() || !frames->has_animation(animation) || frame < 0 || frame >= frames->get_frame_count(animation)) {
+		return Rect2();
 	}
 
 	Ref<Texture> t;
 	if (animation)
 		t = frames->get_frame(animation, frame);
 	if (t.is_null())
-		return Node2D::_edit_get_rect();
+		return Rect2();
 	Size2 s = t->get_size();
 
 	Point2 ofs = offset;
@@ -80,10 +101,6 @@ Rect2 AnimatedSprite::_edit_get_rect() const {
 	return Rect2(ofs, s);
 }
 
-bool AnimatedSprite::_edit_use_rect() const {
-	return true;
-}
-
 void SpriteFrames::add_frame(const StringName &p_anim, const Ref<Texture> &p_frame, int p_at_pos) {
 
 	Map<StringName, Anim>::Element *E = animations.find(p_anim);
diff --git a/scene/2d/animated_sprite.h b/scene/2d/animated_sprite.h
index be5b1ef6d6..806052a696 100644
--- a/scene/2d/animated_sprite.h
+++ b/scene/2d/animated_sprite.h
@@ -145,6 +145,7 @@ class AnimatedSprite : public Node2D {
 	void _reset_timeout();
 	void _set_playing(bool p_playing);
 	bool _is_playing() const;
+	Rect2 _get_rect() const;
 
 protected:
 	static void _bind_methods();
@@ -161,6 +162,8 @@ public:
 	virtual Rect2 _edit_get_rect() const;
 	virtual bool _edit_use_rect() const;
 
+	virtual Rect2 get_anchorable_rect() const;
+
 	void set_sprite_frames(const Ref<SpriteFrames> &p_frames);
 	Ref<SpriteFrames> get_sprite_frames() const;
 
diff --git a/scene/2d/back_buffer_copy.cpp b/scene/2d/back_buffer_copy.cpp
index caa1adebdb..e06c30ec6b 100644
--- a/scene/2d/back_buffer_copy.cpp
+++ b/scene/2d/back_buffer_copy.cpp
@@ -59,6 +59,11 @@ bool BackBufferCopy::_edit_use_rect() const {
 	return true;
 }
 
+Rect2 BackBufferCopy::get_anchorable_rect() const {
+
+	return rect;
+}
+
 void BackBufferCopy::set_rect(const Rect2 &p_rect) {
 
 	rect = p_rect;
diff --git a/scene/2d/back_buffer_copy.h b/scene/2d/back_buffer_copy.h
index 752d56de2b..b1ee12544b 100644
--- a/scene/2d/back_buffer_copy.h
+++ b/scene/2d/back_buffer_copy.h
@@ -58,6 +58,7 @@ public:
 
 	void set_rect(const Rect2 &p_rect);
 	Rect2 get_rect() const;
+	Rect2 get_anchorable_rect() const;
 
 	void set_copy_mode(CopyMode p_mode);
 	CopyMode get_copy_mode() const;
diff --git a/scene/2d/canvas_item.cpp b/scene/2d/canvas_item.cpp
index f1c09594da..47326b9be2 100644
--- a/scene/2d/canvas_item.cpp
+++ b/scene/2d/canvas_item.cpp
@@ -321,11 +321,6 @@ void CanvasItem::hide() {
 	_change_notify("visible");
 }
 
-Size2 CanvasItem::_edit_get_minimum_size() const {
-
-	return Size2(-1, -1); //no limit
-}
-
 void CanvasItem::_update_callback() {
 
 	if (!is_inside_tree()) {
@@ -994,7 +989,6 @@ void CanvasItem::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("_edit_set_rect", "rect"), &CanvasItem::_edit_set_rect);
 	ClassDB::bind_method(D_METHOD("_edit_get_rect"), &CanvasItem::_edit_get_rect);
 	ClassDB::bind_method(D_METHOD("_edit_use_rect"), &CanvasItem::_edit_use_rect);
-	ClassDB::bind_method(D_METHOD("_edit_get_item_and_children_rect"), &CanvasItem::_edit_get_item_and_children_rect);
 	ClassDB::bind_method(D_METHOD("_edit_set_rotation", "degrees"), &CanvasItem::_edit_set_rotation);
 	ClassDB::bind_method(D_METHOD("_edit_get_rotation"), &CanvasItem::_edit_get_rotation);
 	ClassDB::bind_method(D_METHOD("_edit_use_rotation"), &CanvasItem::_edit_use_rotation);
@@ -1175,21 +1169,6 @@ int CanvasItem::get_canvas_layer() const {
 		return 0;
 }
 
-Rect2 CanvasItem::_edit_get_item_and_children_rect() const {
-
-	Rect2 rect = _edit_get_rect();
-
-	for (int i = 0; i < get_child_count(); i++) {
-		CanvasItem *c = Object::cast_to<CanvasItem>(get_child(i));
-		if (c) {
-			Rect2 sir = c->get_transform().xform(c->_edit_get_item_and_children_rect());
-			rect = rect.merge(sir);
-		}
-	}
-
-	return rect;
-}
-
 CanvasItem::CanvasItem() :
 		xform_change(this) {
 
diff --git a/scene/2d/canvas_item.h b/scene/2d/canvas_item.h
index 10d5082dfc..1e6a251c9c 100644
--- a/scene/2d/canvas_item.h
+++ b/scene/2d/canvas_item.h
@@ -222,6 +222,9 @@ public:
 
 	/* EDITOR */
 
+	// Select the node
+	virtual bool _edit_is_selected_on_click(const Point2 &p_point, double p_tolerance) const;
+
 	// Save and restore a CanvasItem state
 	virtual void _edit_set_state(const Dictionary &p_state){};
 	virtual Dictionary _edit_get_state() const { return Dictionary(); };
@@ -234,36 +237,21 @@ public:
 	virtual void _edit_set_scale(const Size2 &p_scale) = 0;
 	virtual Size2 _edit_get_scale() const = 0;
 
+	// Used to rotate the node
+	virtual bool _edit_use_rotation() const { return false; };
+	virtual void _edit_set_rotation(float p_rotation){};
+	virtual float _edit_get_rotation() const { return 0.0; };
+
 	// Used to resize/move the node
+	virtual bool _edit_use_rect() const { return false; }; // MAYBE REPLACE BY A _edit_get_editmode()
 	virtual void _edit_set_rect(const Rect2 &p_rect){};
 	virtual Rect2 _edit_get_rect() const { return Rect2(0, 0, 0, 0); };
-	virtual bool _edit_use_rect() const { return false; };
-
-	Rect2 _edit_get_item_and_children_rect() const;
-
-	// used to select the node
-	virtual bool _edit_is_selected_on_click(const Point2 &p_point, double p_tolerance) const;
-
-	// Used to rotate the node
-	virtual void
-	_edit_set_rotation(float p_rotation){};
-	virtual float _edit_get_rotation() const {
-		return 0.0;
-	};
-	virtual bool _edit_use_rotation() const {
-		return false;
-	};
+	virtual Size2 _edit_get_minimum_size() const { return Size2(-1, -1); }; // LOOKS WEIRD
 
 	// Used to set a pivot
+	virtual bool _edit_use_pivot() const { return false; };
 	virtual void _edit_set_pivot(const Point2 &p_pivot){};
-	virtual Point2 _edit_get_pivot() const {
-		return Point2();
-	};
-	virtual bool _edit_use_pivot() const {
-		return false;
-	};
-
-	virtual Size2 _edit_get_minimum_size() const;
+	virtual Point2 _edit_get_pivot() const { return Point2(); };
 
 	/* VISIBILITY */
 
@@ -358,6 +346,9 @@ public:
 	void set_notify_transform(bool p_enable);
 	bool is_transform_notification_enabled() const;
 
+	// Used by control nodes to retreive the parent's anchorable area
+	virtual Rect2 get_anchorable_rect() const { return Rect2(0, 0, 0, 0); };
+
 	int get_canvas_layer() const;
 
 	CanvasItem();
diff --git a/scene/2d/light_2d.cpp b/scene/2d/light_2d.cpp
index 9a44eb31bb..f93c7d1f79 100644
--- a/scene/2d/light_2d.cpp
+++ b/scene/2d/light_2d.cpp
@@ -59,14 +59,22 @@ bool Light2D::_edit_use_pivot() const {
 
 Rect2 Light2D::_edit_get_rect() const {
 	if (texture.is_null())
-		return Node2D::_edit_get_rect();
+		return Rect2();
 
 	Size2 s = texture->get_size() * _scale;
 	return Rect2(texture_offset - s / 2.0, s);
 }
 
 bool Light2D::_edit_use_rect() const {
-	return true;
+	return !texture.is_null();
+}
+
+Rect2 Light2D::get_anchorable_rect() const {
+	if (texture.is_null())
+		return Rect2();
+
+	Size2 s = texture->get_size() * _scale;
+	return Rect2(texture_offset - s / 2.0, s);
 }
 
 void Light2D::_update_light_visibility() {
diff --git a/scene/2d/light_2d.h b/scene/2d/light_2d.h
index 543805e329..40469cfbc8 100644
--- a/scene/2d/light_2d.h
+++ b/scene/2d/light_2d.h
@@ -94,6 +94,8 @@ public:
 	virtual Rect2 _edit_get_rect() const;
 	virtual bool _edit_use_rect() const;
 
+	virtual Rect2 get_anchorable_rect() const;
+
 	void set_enabled(bool p_enabled);
 	bool is_enabled() const;
 
diff --git a/scene/2d/screen_button.cpp b/scene/2d/screen_button.cpp
index 9480f18176..45f63fd5bf 100644
--- a/scene/2d/screen_button.cpp
+++ b/scene/2d/screen_button.cpp
@@ -324,19 +324,21 @@ void TouchScreenButton::_release(bool p_exiting_tree) {
 }
 
 Rect2 TouchScreenButton::_edit_get_rect() const {
-
-	if (texture.is_null())
-		return Rect2(0, 0, 1, 1);
-	/*
 	if (texture.is_null())
 		return CanvasItem::_edit_get_rect();
-	*/
 
 	return Rect2(Size2(), texture->get_size());
 }
 
 bool TouchScreenButton::_edit_use_rect() const {
-	return true;
+	return !texture.is_null();
+}
+
+Rect2 TouchScreenButton::get_anchorable_rect() const {
+	if (texture.is_null())
+		return CanvasItem::get_anchorable_rect();
+
+	return Rect2(Size2(), texture->get_size());
 }
 
 void TouchScreenButton::set_visibility_mode(VisibilityMode p_mode) {
diff --git a/scene/2d/screen_button.h b/scene/2d/screen_button.h
index b2fafcc93d..3e8adc2e5e 100644
--- a/scene/2d/screen_button.h
+++ b/scene/2d/screen_button.h
@@ -103,8 +103,9 @@ public:
 
 	bool is_pressed() const;
 
-	Rect2 _edit_get_rect() const;
+	virtual Rect2 _edit_get_rect() const;
 	virtual bool _edit_use_rect() const;
+	virtual Rect2 get_anchorable_rect() const;
 
 	TouchScreenButton();
 };
diff --git a/scene/2d/sprite.cpp b/scene/2d/sprite.cpp
index 64d0771fab..ebe0e81f6e 100644
--- a/scene/2d/sprite.cpp
+++ b/scene/2d/sprite.cpp
@@ -63,9 +63,16 @@ Rect2 Sprite::_edit_get_rect() const {
 }
 
 bool Sprite::_edit_use_rect() const {
+	if (texture.is_null())
+		return false;
+
 	return true;
 }
 
+Rect2 Sprite::get_anchorable_rect() const {
+	return get_rect();
+}
+
 void Sprite::_get_rects(Rect2 &r_src_rect, Rect2 &r_dst_rect, bool &r_filter_clip) const {
 
 	Rect2 base_rect;
@@ -367,10 +374,6 @@ Rect2 Sprite::get_rect() const {
 
 	if (texture.is_null())
 		return Rect2(0, 0, 1, 1);
-	/*
-	if (texture.is_null())
-		return CanvasItem::_edit_get_rect();
-	*/
 
 	Size2i s;
 
diff --git a/scene/2d/sprite.h b/scene/2d/sprite.h
index 609ad8bb34..0a5ff002cd 100644
--- a/scene/2d/sprite.h
+++ b/scene/2d/sprite.h
@@ -115,6 +115,7 @@ public:
 	int get_hframes() const;
 
 	Rect2 get_rect() const;
+	virtual Rect2 get_anchorable_rect() const;
 
 	Sprite();
 	~Sprite();
diff --git a/scene/2d/tile_map.cpp b/scene/2d/tile_map.cpp
index d88e148b2c..2e480b75c2 100644
--- a/scene/2d/tile_map.cpp
+++ b/scene/2d/tile_map.cpp
@@ -1133,16 +1133,6 @@ PoolVector<int> TileMap::_get_tile_data() const {
 	return data;
 }
 
-Rect2 TileMap::_edit_get_rect() const {
-
-	const_cast<TileMap *>(this)->_update_dirty_quadrants();
-	return rect_cache;
-}
-
-bool TileMap::_edit_use_rect() const {
-	return true;
-}
-
 void TileMap::set_collision_layer(uint32_t p_layer) {
 
 	collision_layer = p_layer;
diff --git a/scene/2d/tile_map.h b/scene/2d/tile_map.h
index 07947004b3..fb8bd86a02 100644
--- a/scene/2d/tile_map.h
+++ b/scene/2d/tile_map.h
@@ -244,9 +244,6 @@ public:
 	void set_cellv(const Vector2 &p_pos, int p_tile, bool p_flip_x = false, bool p_flip_y = false, bool p_transpose = false);
 	int get_cellv(const Vector2 &p_pos) const;
 
-	Rect2 _edit_get_rect() const;
-	virtual bool _edit_use_rect() const;
-
 	void make_bitmask_area_dirty(const Vector2 &p_pos);
 	void update_bitmask_area(const Vector2 &p_pos);
 	void update_bitmask_region(const Vector2 &p_start = Vector2(), const Vector2 &p_end = Vector2());