Rename Control margin to offset

1 files changed, 39 insertions, 39 deletions

diff --git a/editor/plugins/canvas_item_editor_plugin.h b/editor/plugins/canvas_item_editor_plugin.h
index c4a1dca593..f5da953810 100644
--- a/editor/plugins/canvas_item_editor_plugin.h
+++ b/editor/plugins/canvas_item_editor_plugin.h
@@ -119,23 +119,23 @@ private:
 		UNLOCK_SELECTED,
 		GROUP_SELECTED,
 		UNGROUP_SELECTED,
-		ANCHORS_AND_MARGINS_PRESET_TOP_LEFT,
-		ANCHORS_AND_MARGINS_PRESET_TOP_RIGHT,
-		ANCHORS_AND_MARGINS_PRESET_BOTTOM_LEFT,
-		ANCHORS_AND_MARGINS_PRESET_BOTTOM_RIGHT,
-		ANCHORS_AND_MARGINS_PRESET_CENTER_LEFT,
-		ANCHORS_AND_MARGINS_PRESET_CENTER_RIGHT,
-		ANCHORS_AND_MARGINS_PRESET_CENTER_TOP,
-		ANCHORS_AND_MARGINS_PRESET_CENTER_BOTTOM,
-		ANCHORS_AND_MARGINS_PRESET_CENTER,
-		ANCHORS_AND_MARGINS_PRESET_TOP_WIDE,
-		ANCHORS_AND_MARGINS_PRESET_LEFT_WIDE,
-		ANCHORS_AND_MARGINS_PRESET_RIGHT_WIDE,
-		ANCHORS_AND_MARGINS_PRESET_BOTTOM_WIDE,
-		ANCHORS_AND_MARGINS_PRESET_VCENTER_WIDE,
-		ANCHORS_AND_MARGINS_PRESET_HCENTER_WIDE,
-		ANCHORS_AND_MARGINS_PRESET_WIDE,
-		ANCHORS_AND_MARGINS_PRESET_KEEP_RATIO,
+		ANCHORS_AND_OFFSETS_PRESET_TOP_LEFT,
+		ANCHORS_AND_OFFSETS_PRESET_TOP_RIGHT,
+		ANCHORS_AND_OFFSETS_PRESET_BOTTOM_LEFT,
+		ANCHORS_AND_OFFSETS_PRESET_BOTTOM_RIGHT,
+		ANCHORS_AND_OFFSETS_PRESET_CENTER_LEFT,
+		ANCHORS_AND_OFFSETS_PRESET_CENTER_RIGHT,
+		ANCHORS_AND_OFFSETS_PRESET_CENTER_TOP,
+		ANCHORS_AND_OFFSETS_PRESET_CENTER_BOTTOM,
+		ANCHORS_AND_OFFSETS_PRESET_CENTER,
+		ANCHORS_AND_OFFSETS_PRESET_TOP_WIDE,
+		ANCHORS_AND_OFFSETS_PRESET_LEFT_WIDE,
+		ANCHORS_AND_OFFSETS_PRESET_RIGHT_WIDE,
+		ANCHORS_AND_OFFSETS_PRESET_BOTTOM_WIDE,
+		ANCHORS_AND_OFFSETS_PRESET_VCENTER_WIDE,
+		ANCHORS_AND_OFFSETS_PRESET_HCENTER_WIDE,
+		ANCHORS_AND_OFFSETS_PRESET_WIDE,
+		ANCHORS_AND_OFFSETS_PRESET_KEEP_RATIO,
 		ANCHORS_PRESET_TOP_LEFT,
 		ANCHORS_PRESET_TOP_RIGHT,
 		ANCHORS_PRESET_BOTTOM_LEFT,
@@ -152,22 +152,22 @@ private:
 		ANCHORS_PRESET_VCENTER_WIDE,
 		ANCHORS_PRESET_HCENTER_WIDE,
 		ANCHORS_PRESET_WIDE,
-		MARGINS_PRESET_TOP_LEFT,
-		MARGINS_PRESET_TOP_RIGHT,
-		MARGINS_PRESET_BOTTOM_LEFT,
-		MARGINS_PRESET_BOTTOM_RIGHT,
-		MARGINS_PRESET_CENTER_LEFT,
-		MARGINS_PRESET_CENTER_RIGHT,
-		MARGINS_PRESET_CENTER_TOP,
-		MARGINS_PRESET_CENTER_BOTTOM,
-		MARGINS_PRESET_CENTER,
-		MARGINS_PRESET_TOP_WIDE,
-		MARGINS_PRESET_LEFT_WIDE,
-		MARGINS_PRESET_RIGHT_WIDE,
-		MARGINS_PRESET_BOTTOM_WIDE,
-		MARGINS_PRESET_VCENTER_WIDE,
-		MARGINS_PRESET_HCENTER_WIDE,
-		MARGINS_PRESET_WIDE,
+		OFFSETS_PRESET_TOP_LEFT,
+		OFFSETS_PRESET_TOP_RIGHT,
+		OFFSETS_PRESET_BOTTOM_LEFT,
+		OFFSETS_PRESET_BOTTOM_RIGHT,
+		OFFSETS_PRESET_CENTER_LEFT,
+		OFFSETS_PRESET_CENTER_RIGHT,
+		OFFSETS_PRESET_CENTER_TOP,
+		OFFSETS_PRESET_CENTER_BOTTOM,
+		OFFSETS_PRESET_CENTER,
+		OFFSETS_PRESET_TOP_WIDE,
+		OFFSETS_PRESET_LEFT_WIDE,
+		OFFSETS_PRESET_RIGHT_WIDE,
+		OFFSETS_PRESET_BOTTOM_WIDE,
+		OFFSETS_PRESET_VCENTER_WIDE,
+		OFFSETS_PRESET_HCENTER_WIDE,
+		OFFSETS_PRESET_WIDE,
 		ANIM_INSERT_KEY,
 		ANIM_INSERT_KEY_EXISTING,
 		ANIM_INSERT_POS,
@@ -454,9 +454,9 @@ private:
 
 	void _unhandled_key_input(const Ref<InputEvent> &p_ev);
 
-	void _draw_text_at_position(Point2 p_position, String p_string, Margin p_side);
-	void _draw_margin_at_position(int p_value, Point2 p_position, Margin p_side);
-	void _draw_percentage_at_position(float p_value, Point2 p_position, Margin p_side);
+	void _draw_text_at_position(Point2 p_position, String p_string, Side p_side);
+	void _draw_margin_at_position(int p_value, Point2 p_position, Side p_side);
+	void _draw_percentage_at_position(float p_value, Point2 p_position, Side p_side);
 	void _draw_straight_line(Point2 p_from, Point2 p_to, Color p_color);
 
 	void _draw_smart_snapping();
@@ -519,9 +519,9 @@ private:
 			const Node *p_current);
 
 	void _set_anchors_preset(Control::LayoutPreset p_preset);
-	void _set_margins_preset(Control::LayoutPreset p_preset);
-	void _set_anchors_and_margins_preset(Control::LayoutPreset p_preset);
-	void _set_anchors_and_margins_to_keep_ratio();
+	void _set_offsets_preset(Control::LayoutPreset p_preset);
+	void _set_anchors_and_offsets_preset(Control::LayoutPreset p_preset);
+	void _set_anchors_and_offsets_to_keep_ratio();
 
 	void _button_toggle_anchor_mode(bool p_status);