Replace GUI anchor type by a float between 0 and 1

editor/call_dialog.cpp

@@ -253,8 +253,8 @@ CallDialog::CallDialog() {
 	call->set_anchor( MARGIN_TOP, ANCHOR_END );
 	call->set_anchor( MARGIN_RIGHT, ANCHOR_END );
 	call->set_anchor( MARGIN_BOTTOM, ANCHOR_END );
-	call->set_begin( Point2( 70, 29 ) );
-	call->set_end( Point2( 15, 15 ) );
+	call->set_begin( Point2( -70, -29 ) );
+	call->set_end( Point2( -15, -15 ) );
 	call->set_text(TTR("Call"));
 
 	add_child(call);
@@ -262,8 +262,8 @@ CallDialog::CallDialog() {
 	cancel = memnew( Button );
 	cancel->set_anchor( MARGIN_TOP, ANCHOR_END );
 	cancel->set_anchor( MARGIN_BOTTOM, ANCHOR_END );
-	cancel->set_begin( Point2( 15, 29 ) );
-	cancel->set_end( Point2( 70, 15 ) );
+	cancel->set_begin( Point2( -15, 29 ) );
+	cancel->set_end( Point2( 70, -15 ) );
 	cancel->set_text(TTR("Close"));
 
 	add_child(cancel);
@@ -272,7 +272,7 @@ CallDialog::CallDialog() {
 
 	tree->set_anchor( MARGIN_BOTTOM, ANCHOR_END );
 	tree->set_begin( Point2( 20,50 ) );
-	tree->set_margin(MARGIN_BOTTOM, 44 );
+	tree->set_margin(MARGIN_BOTTOM, -44 );
 	tree->set_margin(MARGIN_RIGHT, 0.5 );
 	tree->set_select_mode( Tree::SELECT_ROW );
 	add_child(tree);
@@ -282,10 +282,10 @@ CallDialog::CallDialog() {
 
 	property_editor = memnew( PropertyEditor );
 
-	property_editor->set_anchor_and_margin( MARGIN_RIGHT, ANCHOR_END, 15 );
+	property_editor->set_anchor_and_margin( MARGIN_RIGHT, ANCHOR_END, -15 );
 	property_editor->set_anchor_and_margin( MARGIN_TOP, ANCHOR_BEGIN, 50 );
 	//property_editor->set_anchor_and_margin( MARGIN_LEFT, ANCHOR_RATIO, 0.55 );
-	property_editor->set_anchor_and_margin( MARGIN_BOTTOM, ANCHOR_END, 90 );
+	property_editor->set_anchor_and_margin( MARGIN_BOTTOM, ANCHOR_END, -90 );
 	property_editor->get_scene_tree()->set_hide_root( true );
 	property_editor->hide_top_label();
 
@@ -305,15 +305,15 @@ CallDialog::CallDialog() {
 
 	return_label = memnew( Label );
 	//return_label->set_anchor_and_margin( MARGIN_LEFT, ANCHOR_RATIO, 0.53 );
-	return_label->set_anchor_and_margin( MARGIN_TOP, ANCHOR_END, 85 );
+	return_label->set_anchor_and_margin( MARGIN_TOP, ANCHOR_END, -85 );
 	return_label->set_text(TTR("Return:"));
 
 	add_child(return_label);
 
 	return_value = memnew( LineEdit );
 	//return_value->set_anchor_and_margin( MARGIN_LEFT, ANCHOR_RATIO, 0.55 );
-	return_value->set_anchor_and_margin( MARGIN_RIGHT, ANCHOR_END, 15 );
-	return_value->set_anchor_and_margin( MARGIN_TOP, ANCHOR_END, 65 );
+	return_value->set_anchor_and_margin( MARGIN_RIGHT, ANCHOR_END, -15 );
+	return_value->set_anchor_and_margin( MARGIN_TOP, ANCHOR_END, -65 );
 
 	add_child(return_value);
 

editor/code_editor.cpp

@@ -70,7 +70,7 @@ GotoLineDialog::GotoLineDialog() {
 	line = memnew(LineEdit);
 	line->set_anchor(MARGIN_RIGHT, ANCHOR_END);
 	line->set_begin(Point2(15, 22));
-	line->set_end(Point2(15, 35));
+	line->set_end(Point2(-15, 35));
 	add_child(line);
 	register_text_enter(line);
 	text_editor = NULL;
@@ -887,7 +887,7 @@ FindReplaceDialog::FindReplaceDialog() {
 	replace_text = memnew(LineEdit);
 	replace_text->set_anchor(MARGIN_RIGHT, ANCHOR_END);
 	replace_text->set_begin(Point2(15, 132));
-	replace_text->set_end(Point2(15, 135));
+	replace_text->set_end(Point2(-15, 135));
 	//replace_text->set_self_opacity(0.7);
 	replace_mc->add_child(replace_text);
 
@@ -937,8 +937,8 @@ FindReplaceDialog::FindReplaceDialog() {
 	skip->set_anchor(MARGIN_TOP, ANCHOR_END);
 	skip->set_anchor(MARGIN_RIGHT, ANCHOR_END);
 	skip->set_anchor(MARGIN_BOTTOM, ANCHOR_END);
-	skip->set_begin(Point2(70, button_margin));
-	skip->set_end(Point2(10, margin));
+	skip->set_begin(Point2(-70, -button_margin));
+	skip->set_end(Point2(-10, -margin));
 	skip->set_text(TTR("Skip"));
 	add_child(skip);
 	skip->connect("pressed", this, "_skip_pressed");

editor/editor_name_dialog.cpp

@@ -87,6 +87,6 @@ EditorNameDialog::EditorNameDialog() {
 	makevb->add_child(name);
 	name->set_margin(MARGIN_TOP, 5);
 	name->set_anchor_and_margin(MARGIN_LEFT, ANCHOR_BEGIN, 5);
-	name->set_anchor_and_margin(MARGIN_RIGHT, ANCHOR_END, 5);
+	name->set_anchor_and_margin(MARGIN_RIGHT, ANCHOR_END, -5);
 	name->connect("gui_input", this, "_line_gui_input");
 }

editor/output_strings.cpp

@@ -38,15 +38,15 @@ void OutputStrings::update_scrollbars() {
 	v_scroll->set_anchor(MARGIN_RIGHT, ANCHOR_END);
 	v_scroll->set_anchor(MARGIN_BOTTOM, ANCHOR_END);
 
-	v_scroll->set_begin(Point2(vmin.width, 0));
+	v_scroll->set_begin(Point2(-vmin.width, 0));
 	v_scroll->set_end(Point2(0, 0));
 
 	h_scroll->set_anchor(MARGIN_RIGHT, ANCHOR_END);
 	h_scroll->set_anchor(MARGIN_TOP, ANCHOR_END);
 	h_scroll->set_anchor(MARGIN_BOTTOM, ANCHOR_END);
 
-	h_scroll->set_begin(Point2(0, hmin.y));
-	h_scroll->set_end(Point2(vmin.x, 0));
+	h_scroll->set_begin(Point2(0, -hmin.y));
+	h_scroll->set_end(Point2(-vmin.x, 0));
 
 	margin.y = hmin.y;
 	margin.x = vmin.x;

editor/plugins/animation_tree_editor_plugin.cpp

@@ -1371,7 +1371,7 @@ AnimationTreeEditor::AnimationTreeEditor() {
 
 	edit_option = memnew(OptionButton);
 	edit_option->set_anchor(MARGIN_RIGHT, ANCHOR_END);
-	edit_option->set_margin(MARGIN_RIGHT, 10);
+	edit_option->set_margin(MARGIN_RIGHT, -10);
 	edit_dialog->add_child(edit_option);
 	edit_option->connect("item_selected", this, "_edit_dialog_changedf");
 	edit_option->hide();
@@ -1379,7 +1379,7 @@ AnimationTreeEditor::AnimationTreeEditor() {
 	for (int i = 0; i < 2; i++) {
 		edit_scroll[i] = memnew(HSlider);
 		edit_scroll[i]->set_anchor(MARGIN_RIGHT, ANCHOR_END);
-		edit_scroll[i]->set_margin(MARGIN_RIGHT, 10);
+		edit_scroll[i]->set_margin(MARGIN_RIGHT, -10);
 		edit_dialog->add_child(edit_scroll[i]);
 		edit_scroll[i]->hide();
 		edit_scroll[i]->connect("value_changed", this, "_edit_dialog_changedf");
@@ -1387,7 +1387,7 @@ AnimationTreeEditor::AnimationTreeEditor() {
 	for (int i = 0; i < 4; i++) {
 		edit_line[i] = memnew(LineEdit);
 		edit_line[i]->set_anchor(MARGIN_RIGHT, ANCHOR_END);
-		edit_line[i]->set_margin(MARGIN_RIGHT, 10);
+		edit_line[i]->set_margin(MARGIN_RIGHT, -10);
 		edit_dialog->add_child(edit_line[i]);
 		edit_line[i]->hide();
 		edit_line[i]->connect("text_changed", this, "_edit_dialog_changeds");
@@ -1399,14 +1399,14 @@ AnimationTreeEditor::AnimationTreeEditor() {
 
 	edit_button = memnew(Button);
 	edit_button->set_anchor(MARGIN_RIGHT, ANCHOR_END);
-	edit_button->set_margin(MARGIN_RIGHT, 10);
+	edit_button->set_margin(MARGIN_RIGHT, -10);
 	edit_dialog->add_child(edit_button);
 	edit_button->hide();
 	edit_button->connect("pressed", this, "_edit_oneshot_start");
 
 	edit_check = memnew(CheckButton);
 	edit_check->set_anchor(MARGIN_RIGHT, ANCHOR_END);
-	edit_check->set_margin(MARGIN_RIGHT, 10);
+	edit_check->set_margin(MARGIN_RIGHT, -10);
 	edit_dialog->add_child(edit_check);
 	edit_check->hide();
 	edit_check->connect("pressed", this, "_edit_dialog_changed");
@@ -1428,7 +1428,7 @@ AnimationTreeEditor::AnimationTreeEditor() {
 
 	filter_button = memnew(Button);
 	filter_button->set_anchor(MARGIN_RIGHT, ANCHOR_END);
-	filter_button->set_margin(MARGIN_RIGHT, 10);
+	filter_button->set_margin(MARGIN_RIGHT, -10);
 	edit_dialog->add_child(filter_button);
 	filter_button->hide();
 	filter_button->set_text(TTR("Filters.."));

editor/plugins/camera_editor_plugin.cpp

@@ -88,7 +88,7 @@ CameraEditor::CameraEditor() {
 	preview->set_toggle_mode(true);
 	preview->set_anchor(MARGIN_LEFT, Control::ANCHOR_END);
 	preview->set_anchor(MARGIN_RIGHT, Control::ANCHOR_END);
-	preview->set_margin(MARGIN_LEFT, 60);
+	preview->set_margin(MARGIN_LEFT, -60);
 	preview->set_margin(MARGIN_RIGHT, 0);
 	preview->set_margin(MARGIN_TOP, 0);
 	preview->set_margin(MARGIN_BOTTOM, 10);

editor/plugins/canvas_item_editor_plugin.cpp

@@ -2338,7 +2338,7 @@ void CanvasItemEditor::_update_scroll(float) {
 	viewport->update();
 }
 
-void CanvasItemEditor::_set_anchor(Control::AnchorType p_left, Control::AnchorType p_top, Control::AnchorType p_right, Control::AnchorType p_bottom) {
+void CanvasItemEditor::_set_anchor(float p_left, float p_top, float p_right, float p_bottom) {
 	List<Node *> &selection = editor_selection->get_selected_node_list();
 
 	undo_redo->create_action(TTR("Change Anchors"));
@@ -3372,7 +3372,7 @@ CanvasItemEditor::CanvasItemEditor(EditorNode *p_editor) {
 	dialog_val = memnew(SpinBox);
 	dialog_val->set_anchor(MARGIN_RIGHT, ANCHOR_END);
 	dialog_val->set_begin(Point2(15, 25));
-	dialog_val->set_end(Point2(10, 25));
+	dialog_val->set_end(Point2(-10, 25));
 	value_dialog->add_child(dialog_val);
 	dialog_val->connect("value_changed", this, "_dialog_value_changed");
 	select_sb = Ref<StyleBoxTexture>(memnew(StyleBoxTexture));

editor/plugins/canvas_item_editor_plugin.h

@@ -360,7 +360,7 @@ class CanvasItemEditor : public VBoxContainer {
 
 	void _focus_selection(int p_op);
 
-	void _set_anchor(Control::AnchorType p_left, Control::AnchorType p_top, Control::AnchorType p_right, Control::AnchorType p_bottom);
+	void _set_anchor(float p_left, float p_top, float p_right, float p_bottom);
 	void _set_full_rect();
 
 	HSplitContainer *palette_split;

editor/plugins/multimesh_editor_plugin.cpp

@@ -381,7 +381,7 @@ MultiMeshEditor::MultiMeshEditor() {
 	populate_amount = memnew(SpinBox);
 	populate_amount->set_anchor(MARGIN_RIGHT, ANCHOR_END);
 	populate_amount->set_begin(Point2(20, 232));
-	populate_amount->set_end(Point2(5, 237));
+	populate_amount->set_end(Point2(-5, 237));
 	populate_amount->set_min(1);
 	populate_amount->set_max(65536);
 	populate_amount->set_value(128);

editor/plugins/sample_editor_plugin.cpp

@@ -366,14 +366,14 @@ SampleEditor::SampleEditor() {
 	sample_texframe = memnew( TextureRect );
 	add_child(sample_texframe);
 	sample_texframe->set_anchor_and_margin(MARGIN_LEFT,ANCHOR_BEGIN,5);
-	sample_texframe->set_anchor_and_margin(MARGIN_RIGHT,ANCHOR_END,5);
+	sample_texframe->set_anchor_and_margin(MARGIN_RIGHT,ANCHOR_END,-5);
 	sample_texframe->set_anchor_and_margin(MARGIN_TOP,ANCHOR_BEGIN,30);
-	sample_texframe->set_anchor_and_margin(MARGIN_BOTTOM,ANCHOR_END,5);
+	sample_texframe->set_anchor_and_margin(MARGIN_BOTTOM,ANCHOR_END,-5);
 
 	info_label = memnew( Label );
 	sample_texframe->add_child(info_label);
 	info_label->set_area_as_parent_rect();
-	info_label->set_anchor_and_margin(MARGIN_TOP,ANCHOR_END,15);
+	info_label->set_anchor_and_margin(MARGIN_TOP,ANCHOR_END,-15);
 	info_label->set_margin(MARGIN_BOTTOM,4);
 	info_label->set_margin(MARGIN_RIGHT,4);
 	info_label->set_align(Label::ALIGN_RIGHT);

editor/plugins/sample_library_editor_plugin.cpp

@@ -452,9 +452,9 @@ SampleLibraryEditor::SampleLibraryEditor() {
 	tree->set_columns(6);
 	add_child(tree);
 	tree->set_anchor_and_margin(MARGIN_LEFT,ANCHOR_BEGIN,5);
-	tree->set_anchor_and_margin(MARGIN_RIGHT,ANCHOR_END,5);
+	tree->set_anchor_and_margin(MARGIN_RIGHT,ANCHOR_END,-5);
 	tree->set_anchor_and_margin(MARGIN_TOP,ANCHOR_BEGIN,30);
-	tree->set_anchor_and_margin(MARGIN_BOTTOM,ANCHOR_END,5);
+	tree->set_anchor_and_margin(MARGIN_BOTTOM,ANCHOR_END,-5);
 	tree->set_column_titles_visible(true);
 	tree->set_column_title(0,TTR("Name"));
 	tree->set_column_title(1,TTR("Preview"));

editor/plugins/sample_player_editor_plugin.cpp

@@ -120,8 +120,8 @@ SamplePlayerEditor::SamplePlayerEditor() {
 
 	play->set_position(Point2( 5, 5 ));
 	play->set_toggle_mode(true);
-	play->set_anchor_and_margin(MARGIN_LEFT,Control::ANCHOR_END,250);
-	play->set_anchor_and_margin(MARGIN_RIGHT,Control::ANCHOR_END,230);
+	play->set_anchor_and_margin(MARGIN_LEFT,Control::ANCHOR_END,-250);
+	play->set_anchor_and_margin(MARGIN_RIGHT,Control::ANCHOR_END,-230);
 	play->set_anchor_and_margin(MARGIN_TOP,Control::ANCHOR_BEGIN,0);
 	play->set_anchor_and_margin(MARGIN_BOTTOM,Control::ANCHOR_BEGIN,0);
 
@@ -131,15 +131,15 @@ SamplePlayerEditor::SamplePlayerEditor() {
 
 	stop->set_position(Point2( 35, 5 ));
 	stop->set_toggle_mode(true);
-	stop->set_anchor_and_margin(MARGIN_LEFT,Control::ANCHOR_END,220);
-	stop->set_anchor_and_margin(MARGIN_RIGHT,Control::ANCHOR_END,200);
+	stop->set_anchor_and_margin(MARGIN_LEFT,Control::ANCHOR_END,-220);
+	stop->set_anchor_and_margin(MARGIN_RIGHT,Control::ANCHOR_END,-200);
 	stop->set_anchor_and_margin(MARGIN_TOP,Control::ANCHOR_BEGIN,0);
 	stop->set_anchor_and_margin(MARGIN_BOTTOM,Control::ANCHOR_BEGIN,0);
 	add_child(stop);
 
 	samples = memnew( OptionButton );
-	samples->set_anchor_and_margin(MARGIN_LEFT,Control::ANCHOR_END,190);
-	samples->set_anchor_and_margin(MARGIN_RIGHT,Control::ANCHOR_END,5);
+	samples->set_anchor_and_margin(MARGIN_LEFT,Control::ANCHOR_END,-190);
+	samples->set_anchor_and_margin(MARGIN_RIGHT,Control::ANCHOR_END,-5);
 	samples->set_anchor_and_margin(MARGIN_TOP,Control::ANCHOR_BEGIN,0);
 	samples->set_anchor_and_margin(MARGIN_BOTTOM,Control::ANCHOR_BEGIN,0);
 	add_child(samples);
@@ -182,7 +182,7 @@ SamplePlayerEditorPlugin::SamplePlayerEditorPlugin(EditorNode *p_node) {
 
 	sample_player_editor->set_anchor(MARGIN_LEFT,Control::ANCHOR_END);
 	sample_player_editor->set_anchor(MARGIN_RIGHT,Control::ANCHOR_END);
-	sample_player_editor->set_margin(MARGIN_LEFT,250);
+	sample_player_editor->set_margin(MARGIN_LEFT,-250);
 	sample_player_editor->set_margin(MARGIN_RIGHT,0);
 	sample_player_editor->set_margin(MARGIN_TOP,0);
 	sample_player_editor->set_margin(MARGIN_BOTTOM,10);

editor/plugins/spatial_editor_plugin.cpp

@@ -2485,7 +2485,7 @@ SpatialEditorViewport::SpatialEditorViewport(SpatialEditor *p_spatial_editor, Ed
 
 	preview_camera = memnew(Button);
 	preview_camera->set_toggle_mode(true);
-	preview_camera->set_anchor_and_margin(MARGIN_LEFT, ANCHOR_END, 90 * EDSCALE);
+	preview_camera->set_anchor_and_margin(MARGIN_LEFT, ANCHOR_END, -90 * EDSCALE);
 	preview_camera->set_anchor_and_margin(MARGIN_TOP, ANCHOR_BEGIN, 10 * EDSCALE);
 	preview_camera->set_text("preview");
 	surface->add_child(preview_camera);

editor/property_editor.cpp

@@ -434,13 +434,13 @@ bool CustomPropertyEditor::edit(Object *p_owner, const String &p_name, Variant::
 			} else if (hint == PROPERTY_HINT_EXP_EASING) {
 
 				easing_draw->set_anchor_and_margin(MARGIN_LEFT, ANCHOR_BEGIN, 5 * EDSCALE);
-				easing_draw->set_anchor_and_margin(MARGIN_RIGHT, ANCHOR_END, 5 * EDSCALE);
+				easing_draw->set_anchor_and_margin(MARGIN_RIGHT, ANCHOR_END, -5 * EDSCALE);
 				easing_draw->set_anchor_and_margin(MARGIN_TOP, ANCHOR_BEGIN, 5 * EDSCALE);
-				easing_draw->set_anchor_and_margin(MARGIN_BOTTOM, ANCHOR_END, 30 * EDSCALE);
+				easing_draw->set_anchor_and_margin(MARGIN_BOTTOM, ANCHOR_END, -30 * EDSCALE);
 				type_button->set_anchor_and_margin(MARGIN_LEFT, ANCHOR_BEGIN, 3 * EDSCALE);
-				type_button->set_anchor_and_margin(MARGIN_RIGHT, ANCHOR_END, 3 * EDSCALE);
-				type_button->set_anchor_and_margin(MARGIN_TOP, ANCHOR_END, 25 * EDSCALE);
-				type_button->set_anchor_and_margin(MARGIN_BOTTOM, ANCHOR_END, 7 * EDSCALE);
+				type_button->set_anchor_and_margin(MARGIN_RIGHT, ANCHOR_END, -3 * EDSCALE);
+				type_button->set_anchor_and_margin(MARGIN_TOP, ANCHOR_END, -25 * EDSCALE);
+				type_button->set_anchor_and_margin(MARGIN_BOTTOM, ANCHOR_END, -7 * EDSCALE);
 				type_button->set_text(TTR("Preset.."));
 				type_button->get_popup()->clear();
 				type_button->get_popup()->add_item(TTR("Linear"), EASING_LINEAR);
@@ -523,8 +523,8 @@ bool CustomPropertyEditor::edit(Object *p_owner, const String &p_name, Variant::
 				action_buttons[0]->set_anchor(MARGIN_TOP, ANCHOR_END);
 				action_buttons[0]->set_anchor(MARGIN_RIGHT, ANCHOR_END);
 				action_buttons[0]->set_anchor(MARGIN_BOTTOM, ANCHOR_END);
-				action_buttons[0]->set_begin(Point2(70 * EDSCALE, button_margin - 5 * EDSCALE));
-				action_buttons[0]->set_end(Point2(margin, margin));
+				action_buttons[0]->set_begin(Point2(-70 * EDSCALE, -button_margin + 5 * EDSCALE));
+				action_buttons[0]->set_end(Point2(-margin, -margin));
 				action_buttons[0]->set_text(TTR("Close"));
 				action_buttons[0]->show();
 

main/tests/test_gui.cpp

@@ -278,7 +278,7 @@ public:
 
 		richtext->set_position(Point2(600, 210));
 		richtext->set_size(Point2(180, 250));
-		richtext->set_anchor_and_margin(MARGIN_RIGHT, Control::ANCHOR_END, 20);
+		richtext->set_anchor_and_margin(MARGIN_RIGHT, Control::ANCHOR_END, -20);
 
 		frame->add_child(richtext);
 
@@ -319,8 +319,6 @@ public:
 		///richtext->add_text("Hello!\n");
 		//richtext->pop();
 
-		richtext->set_anchor(MARGIN_RIGHT, Control::ANCHOR_END);
-
 		TabContainer *tabc = memnew(TabContainer);
 
 		Control *ctl = memnew(Control);

modules/gridmap/grid_map_editor_plugin.cpp

@@ -1203,7 +1203,7 @@ GridMapEditor::GridMapEditor(EditorNode *p_editor) {
 	edit_mode = memnew(OptionButton);
 	edit_mode->set_area_as_parent_rect();
 	edit_mode->set_anchor_and_margin(MARGIN_BOTTOM, ANCHOR_BEGIN, 24);
-	edit_mode->set_anchor_and_margin(MARGIN_RIGHT, ANCHOR_END, 14);
+	edit_mode->set_anchor_and_margin(MARGIN_RIGHT, ANCHOR_END, -14);
 	edit_mode->add_item("Tiles");
 	edit_mode->add_item("Areas");
 	hb->add_child(edit_mode);

modules/visual_script/visual_script_editor.cpp

@@ -3271,7 +3271,7 @@ VisualScriptEditor::VisualScriptEditor() {
 	graph->set_area_as_parent_rect();
 
 	hint_text = memnew(Label);
-	hint_text->set_anchor_and_margin(MARGIN_TOP, ANCHOR_END, 100);
+	hint_text->set_anchor_and_margin(MARGIN_TOP, ANCHOR_END, -100);
 	hint_text->set_anchor_and_margin(MARGIN_BOTTOM, ANCHOR_END, 0);
 	hint_text->set_anchor_and_margin(MARGIN_RIGHT, ANCHOR_END, 0);
 	hint_text->set_align(Label::ALIGN_CENTER);

scene/gui/control.cpp

@@ -1212,21 +1212,7 @@ void Control::_size_changed() {
 	for (int i = 0; i < 4; i++) {
 
 		float area = parent_size[i & 1];
-		switch (data.anchor[i]) {
-
-			case ANCHOR_BEGIN: {
-
-				margin_pos[i] = data.margin[i];
-			} break;
-			case ANCHOR_END: {
-
-				margin_pos[i] = area - data.margin[i];
-			} break;
-			case ANCHOR_CENTER: {
-
-				margin_pos[i] = (area / 2) - data.margin[i];
-			} break;
-		}
+		margin_pos[i] = data.margin[i] + (data.anchor[i] * area);
 	}
 
 	Point2 new_pos_cache = Point2(margin_pos[0], margin_pos[1]);
@@ -1299,59 +1285,29 @@ float Control::_get_range(int p_idx) const {
 	return to - from;
 }
 
-float Control::_s2a(float p_val, AnchorType p_anchor, float p_range) const {
-
-	switch (p_anchor) {
-
-		case ANCHOR_BEGIN: {
-			return p_val;
-		} break;
-		case ANCHOR_END: {
-			return p_range - p_val;
-		} break;
-		case ANCHOR_CENTER: {
-			return (p_range / 2) - p_val;
-		} break;
-	}
-
-	return 0;
+float Control::_s2a(float p_val, float p_anchor, float p_range) const {
+	return p_val - (p_anchor * p_range);
 }
 
-float Control::_a2s(float p_val, AnchorType p_anchor, float p_range) const {
-
-	switch (p_anchor) {
-
-		case ANCHOR_BEGIN: {
-			return Math::floor(p_val);
-		} break;
-		case ANCHOR_END: {
-			return Math::floor(p_range - p_val);
-		} break;
-		case ANCHOR_CENTER: {
-			return Math::floor((p_range / 2) - p_val);
-		} break;
-	}
-	return 0;
+float Control::_a2s(float p_val, float p_anchor, float p_range) const {
+	return Math::floor(p_val + (p_anchor * p_range));
 }
 
-void Control::set_anchor(Margin p_margin, AnchorType p_anchor, bool p_keep_margin) {
-
-	if (!is_inside_tree()) {
-
-		data.anchor[p_margin] = p_anchor;
-	} else if (!p_keep_margin) {
-		float pr = _get_parent_range(p_margin);
-		float s = _a2s(data.margin[p_margin], data.anchor[p_margin], pr);
-		data.anchor[p_margin] = p_anchor;
-		data.margin[p_margin] = _s2a(s, p_anchor, pr);
-	} else {
-		data.anchor[p_margin] = p_anchor;
-		_size_changed();
+void Control::set_anchor(Margin p_margin, float p_anchor, bool p_keep_margin) {
+	data.anchor[p_margin] = CLAMP(p_anchor, 0.0, 1.0);
+	if (is_inside_tree()) {
+		if (!p_keep_margin) {
+			float pr = _get_parent_range(p_margin);
+			float s = _a2s(data.margin[p_margin], data.anchor[p_margin], pr);
+			data.margin[p_margin] = _s2a(s, p_anchor, pr);
+		} else {
+			_size_changed();
+		}
 	}
 	_change_notify();
 }
 
-void Control::_set_anchor(Margin p_margin, AnchorType p_anchor) {
+void Control::_set_anchor(Margin p_margin, float p_anchor) {
 #ifdef TOOLS_ENABLED
 	if (is_inside_tree() && get_tree()->is_editor_hint()) {
 		set_anchor(p_margin, p_anchor, EDITOR_DEF("editors/2d/keep_margins_when_changing_anchors", false));
@@ -1363,13 +1319,13 @@ void Control::_set_anchor(Margin p_margin, AnchorType p_anchor) {
 #endif
 }
 
-void Control::set_anchor_and_margin(Margin p_margin, AnchorType p_anchor, float p_pos) {
+void Control::set_anchor_and_margin(Margin p_margin, float p_anchor, float p_pos) {
 
 	set_anchor(p_margin, p_anchor);
 	set_margin(p_margin, p_pos);
 }
 
-Control::AnchorType Control::get_anchor(Margin p_margin) const {
+float Control::get_anchor(Margin p_margin) const {
 
 	return data.anchor[p_margin];
 }
@@ -1523,11 +1479,13 @@ Rect2 Control::get_item_rect() const {
 void Control::set_area_as_parent_rect(int p_margin) {
 
 	data.anchor[MARGIN_LEFT] = ANCHOR_BEGIN;
+	data.margin[MARGIN_LEFT] = p_margin;
 	data.anchor[MARGIN_TOP] = ANCHOR_BEGIN;
+	data.margin[MARGIN_TOP] = p_margin;
 	data.anchor[MARGIN_RIGHT] = ANCHOR_END;
+	data.margin[MARGIN_RIGHT] = -p_margin;
 	data.anchor[MARGIN_BOTTOM] = ANCHOR_END;
-	for (int i = 0; i < 4; i++)
-		data.margin[i] = p_margin;
+	data.margin[MARGIN_BOTTOM] = -p_margin;
 
 	_size_changed();
 }
@@ -2371,11 +2329,11 @@ void Control::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("accept_event"), &Control::accept_event);
 	ClassDB::bind_method(D_METHOD("get_minimum_size"), &Control::get_minimum_size);
 	ClassDB::bind_method(D_METHOD("get_combined_minimum_size"), &Control::get_combined_minimum_size);
-	ClassDB::bind_method(D_METHOD("set_anchor", "margin", "anchor_mode", "keep_margin"), &Control::set_anchor, DEFVAL(false));
-	ClassDB::bind_method(D_METHOD("_set_anchor", "margin", "anchor_mode"), &Control::_set_anchor);
+	ClassDB::bind_method(D_METHOD("set_anchor", "margin", "anchor", "keep_margin"), &Control::set_anchor, DEFVAL(false));
+	ClassDB::bind_method(D_METHOD("_set_anchor", "margin", "anchor"), &Control::_set_anchor);
 	ClassDB::bind_method(D_METHOD("get_anchor", "margin"), &Control::get_anchor);
 	ClassDB::bind_method(D_METHOD("set_margin", "margin", "offset"), &Control::set_margin);
-	ClassDB::bind_method(D_METHOD("set_anchor_and_margin", "margin", "anchor_mode", "offset"), &Control::set_anchor_and_margin);
+	ClassDB::bind_method(D_METHOD("set_anchor_and_margin", "margin", "anchor", "offset"), &Control::set_anchor_and_margin);
 	ClassDB::bind_method(D_METHOD("set_begin", "pos"), &Control::set_begin);
 	ClassDB::bind_method(D_METHOD("set_end", "pos"), &Control::set_end);
 	ClassDB::bind_method(D_METHOD("set_position", "pos"), &Control::set_position);
@@ -2497,10 +2455,10 @@ void Control::_bind_methods() {
 	BIND_VMETHOD(MethodInfo("drop_data", PropertyInfo(Variant::VECTOR2, "pos"), PropertyInfo(Variant::NIL, "data")));
 
 	ADD_GROUP("Anchor", "anchor_");
-	ADD_PROPERTYINZ(PropertyInfo(Variant::INT, "anchor_left", PROPERTY_HINT_ENUM, "Begin,End,Center"), "_set_anchor", "get_anchor", MARGIN_LEFT);
-	ADD_PROPERTYINZ(PropertyInfo(Variant::INT, "anchor_top", PROPERTY_HINT_ENUM, "Begin,End,Center"), "_set_anchor", "get_anchor", MARGIN_TOP);
-	ADD_PROPERTYINZ(PropertyInfo(Variant::INT, "anchor_right", PROPERTY_HINT_ENUM, "Begin,End,Center"), "_set_anchor", "get_anchor", MARGIN_RIGHT);
-	ADD_PROPERTYINZ(PropertyInfo(Variant::INT, "anchor_bottom", PROPERTY_HINT_ENUM, "Begin,End,Center"), "_set_anchor", "get_anchor", MARGIN_BOTTOM);
+	ADD_PROPERTYI(PropertyInfo(Variant::REAL, "anchor_left", PROPERTY_HINT_RANGE, "0,1,0.01"), "_set_anchor", "get_anchor", MARGIN_LEFT);
+	ADD_PROPERTYI(PropertyInfo(Variant::REAL, "anchor_top", PROPERTY_HINT_RANGE, "0,1,0.01"), "_set_anchor", "get_anchor", MARGIN_TOP);
+	ADD_PROPERTYI(PropertyInfo(Variant::REAL, "anchor_right", PROPERTY_HINT_RANGE, "0,1,0.01"), "_set_anchor", "get_anchor", MARGIN_RIGHT);
+	ADD_PROPERTYI(PropertyInfo(Variant::REAL, "anchor_bottom", PROPERTY_HINT_RANGE, "0,1,0.01"), "_set_anchor", "get_anchor", MARGIN_BOTTOM);
 
 	ADD_GROUP("Margin", "margin_");
 	ADD_PROPERTYINZ(PropertyInfo(Variant::INT, "margin_left", PROPERTY_HINT_RANGE, "-4096,4096"), "set_margin", "get_margin", MARGIN_LEFT);
@@ -2541,9 +2499,6 @@ void Control::_bind_methods() {
 	ADD_PROPERTYNZ(PropertyInfo(Variant::OBJECT, "theme", PROPERTY_HINT_RESOURCE_TYPE, "Theme"), "set_theme", "get_theme");
 	ADD_GROUP("", "");
 
-	BIND_CONSTANT(ANCHOR_BEGIN);
-	BIND_CONSTANT(ANCHOR_END);
-	BIND_CONSTANT(ANCHOR_CENTER);
 	BIND_CONSTANT(FOCUS_NONE);
 	BIND_CONSTANT(FOCUS_CLICK);
 	BIND_CONSTANT(FOCUS_ALL);

scene/gui/control.h

@@ -51,11 +51,9 @@ class Control : public CanvasItem {
 	OBJ_CATEGORY("GUI Nodes");
 
 public:
-	enum AnchorType {
-		ANCHOR_BEGIN,
-		ANCHOR_END,
-		ANCHOR_CENTER,
-	};
+	static const float ANCHOR_BEGIN = 0.0f;
+	static const float ANCHOR_CENTER = 0.5f;
+	static const float ANCHOR_END = 1.0f;
 
 	enum GrowDirection {
 		GROW_DIRECTION_BEGIN,
@@ -122,7 +120,7 @@ private:
 		Size2 size_cache;
 
 		float margin[4];
-		AnchorType anchor[4];
+		float anchor[4];
 		FocusMode focus_mode;
 		GrowDirection h_grow;
 		GrowDirection v_grow;
@@ -182,12 +180,12 @@ private:
 	void _window_find_focus_neighbour(const Vector2 &p_dir, Node *p_at, const Point2 *p_points, float p_min, float &r_closest_dist, Control **r_closest);
 	Control *_get_focus_neighbour(Margin p_margin, int p_count = 0);
 
-	void _set_anchor(Margin p_margin, AnchorType p_anchor);
+	void _set_anchor(Margin p_margin, float p_anchor);
 
 	float _get_parent_range(int p_idx) const;
 	float _get_range(int p_idx) const;
-	float _s2a(float p_val, AnchorType p_anchor, float p_range) const;
-	float _a2s(float p_val, AnchorType p_anchor, float p_range) const;
+	float _s2a(float p_val, float p_anchor, float p_range) const;
+	float _a2s(float p_val, float p_anchor, float p_range) const;
 	void _propagate_theme_changed(CanvasItem *p_at, Control *p_owner, bool p_assign = true);
 	void _theme_changed();
 
@@ -275,10 +273,10 @@ public:
 
 	/* POSITIONING */
 
-	void set_anchor(Margin p_margin, AnchorType p_anchor, bool p_keep_margin = false);
-	void set_anchor_and_margin(Margin p_margin, AnchorType p_anchor, float p_pos);
+	void set_anchor(Margin p_margin, float p_anchor, bool p_keep_margin = false);
+	void set_anchor_and_margin(Margin p_margin, float p_anchor, float p_pos);
 
-	AnchorType get_anchor(Margin p_margin) const;
+	float get_anchor(Margin p_margin) const;
 
 	void set_margin(Margin p_margin, float p_value);
 
@@ -425,7 +423,6 @@ public:
 	~Control();
 };
 
-VARIANT_ENUM_CAST(Control::AnchorType);
 VARIANT_ENUM_CAST(Control::FocusMode);
 VARIANT_ENUM_CAST(Control::SizeFlags);
 VARIANT_ENUM_CAST(Control::CursorShape);

scene/gui/dialogs.cpp

@@ -215,7 +215,7 @@ void WindowDialog::_notification(int p_what) {
 			close_button->set_pressed_texture(get_icon("close", "WindowDialog"));
 			close_button->set_hover_texture(get_icon("close_highlight", "WindowDialog"));
 			close_button->set_anchor(MARGIN_LEFT, ANCHOR_END);
-			close_button->set_begin(Point2(get_constant("close_h_ofs", "WindowDialog"), -get_constant("close_v_ofs", "WindowDialog")));
+			close_button->set_begin(Point2(-get_constant("close_h_ofs", "WindowDialog"), -get_constant("close_v_ofs", "WindowDialog")));
 		} break;
 
 		case NOTIFICATION_MOUSE_EXIT: {
@@ -546,7 +546,7 @@ AcceptDialog::AcceptDialog() {
 	label->set_anchor(MARGIN_RIGHT, ANCHOR_END);
 	label->set_anchor(MARGIN_BOTTOM, ANCHOR_END);
 	label->set_begin(Point2(margin, margin));
-	label->set_end(Point2(margin, button_margin + 10));
+	label->set_end(Point2(-margin, -button_margin - 10));
 	//label->set_autowrap(true);
 	add_child(label);
 

scene/gui/graph_edit.cpp

@@ -269,14 +269,14 @@ void GraphEdit::_notification(int p_what) {
 		Size2 hmin = h_scroll->get_combined_minimum_size();
 		Size2 vmin = v_scroll->get_combined_minimum_size();
 
-		v_scroll->set_anchor_and_margin(MARGIN_LEFT, ANCHOR_END, vmin.width);
+		v_scroll->set_anchor_and_margin(MARGIN_LEFT, ANCHOR_END, -vmin.width);
 		v_scroll->set_anchor_and_margin(MARGIN_RIGHT, ANCHOR_END, 0);
 		v_scroll->set_anchor_and_margin(MARGIN_TOP, ANCHOR_BEGIN, 0);
 		v_scroll->set_anchor_and_margin(MARGIN_BOTTOM, ANCHOR_END, 0);
 
 		h_scroll->set_anchor_and_margin(MARGIN_LEFT, ANCHOR_BEGIN, 0);
 		h_scroll->set_anchor_and_margin(MARGIN_RIGHT, ANCHOR_END, 0);
-		h_scroll->set_anchor_and_margin(MARGIN_TOP, ANCHOR_END, hmin.height);
+		h_scroll->set_anchor_and_margin(MARGIN_TOP, ANCHOR_END, -hmin.height);
 		h_scroll->set_anchor_and_margin(MARGIN_BOTTOM, ANCHOR_END, 0);
 
 		zoom_minus->set_icon(get_icon("minus"));

scene/gui/item_list.cpp

@@ -736,10 +736,10 @@ void ItemList::_notification(int p_what) {
 		Ref<StyleBox> bg = get_stylebox("bg");
 
 		int mw = scroll_bar->get_minimum_size().x;
-		scroll_bar->set_anchor_and_margin(MARGIN_LEFT, ANCHOR_END, mw + bg->get_margin(MARGIN_RIGHT));
-		scroll_bar->set_anchor_and_margin(MARGIN_RIGHT, ANCHOR_END, bg->get_margin(MARGIN_RIGHT));
+		scroll_bar->set_anchor_and_margin(MARGIN_LEFT, ANCHOR_END, -mw + bg->get_margin(MARGIN_RIGHT));
+		scroll_bar->set_anchor_and_margin(MARGIN_RIGHT, ANCHOR_END, -bg->get_margin(MARGIN_RIGHT));
 		scroll_bar->set_anchor_and_margin(MARGIN_TOP, ANCHOR_BEGIN, bg->get_margin(MARGIN_TOP));
-		scroll_bar->set_anchor_and_margin(MARGIN_BOTTOM, ANCHOR_END, bg->get_margin(MARGIN_BOTTOM));
+		scroll_bar->set_anchor_and_margin(MARGIN_BOTTOM, ANCHOR_END, -bg->get_margin(MARGIN_BOTTOM));
 
 		Size2 size = get_size();
 

scene/gui/popup.cpp

@@ -108,13 +108,10 @@ void Popup::set_as_minsize() {
 
 			float margin_begin = c->get_margin(m_beg);
 			float margin_end = c->get_margin(m_end);
-			AnchorType anchor_begin = c->get_anchor(m_beg);
-			AnchorType anchor_end = c->get_anchor(m_end);
+			float anchor_begin = c->get_anchor(m_beg);
+			float anchor_end = c->get_anchor(m_end);
 
-			if (anchor_begin == ANCHOR_BEGIN)
-				minsize[j] += margin_begin;
-			if (anchor_end == ANCHOR_END)
-				minsize[j] += margin_end;
+			minsize[j] += margin_begin * (ANCHOR_END - anchor_begin) + margin_end * anchor_end;
 		}
 
 		total_minsize.width = MAX(total_minsize.width, minsize.width);
@@ -145,13 +142,10 @@ void Popup::popup_centered_minsize(const Size2 &p_minsize) {
 
 			float margin_begin = c->get_margin(m_beg);
 			float margin_end = c->get_margin(m_end);
-			AnchorType anchor_begin = c->get_anchor(m_beg);
-			AnchorType anchor_end = c->get_anchor(m_end);
+			float anchor_begin = c->get_anchor(m_beg);
+			float anchor_end = c->get_anchor(m_end);
 
-			if (anchor_begin == ANCHOR_BEGIN)
-				minsize[j] += margin_begin;
-			if (anchor_end == ANCHOR_END)
-				minsize[j] += margin_end;
+			minsize[j] += margin_begin * (ANCHOR_END - anchor_begin) + margin_end * anchor_end;
 		}
 
 		total_minsize.width = MAX(total_minsize.width, minsize.width);

scene/gui/rich_text_label.cpp

@@ -594,7 +594,7 @@ void RichTextLabel::_update_scroll() {
 			main->first_invalid_line = 0;
 			scroll_w = vscroll->get_combined_minimum_size().width;
 			vscroll->show();
-			vscroll->set_anchor_and_margin(MARGIN_LEFT, ANCHOR_END, scroll_w);
+			vscroll->set_anchor_and_margin(MARGIN_LEFT, ANCHOR_END, -scroll_w);
 			_validate_line_caches(main);
 
 		} else {

scene/gui/scroll_container.cpp

@@ -187,14 +187,14 @@ void ScrollContainer::_update_scrollbar_pos() {
 	Size2 hmin = h_scroll->get_combined_minimum_size();
 	Size2 vmin = v_scroll->get_combined_minimum_size();
 
-	v_scroll->set_anchor_and_margin(MARGIN_LEFT, ANCHOR_END, vmin.width);
+	v_scroll->set_anchor_and_margin(MARGIN_LEFT, ANCHOR_END, -vmin.width);
 	v_scroll->set_anchor_and_margin(MARGIN_RIGHT, ANCHOR_END, 0);
 	v_scroll->set_anchor_and_margin(MARGIN_TOP, ANCHOR_BEGIN, 0);
 	v_scroll->set_anchor_and_margin(MARGIN_BOTTOM, ANCHOR_END, 0);
 
 	h_scroll->set_anchor_and_margin(MARGIN_LEFT, ANCHOR_BEGIN, 0);
 	h_scroll->set_anchor_and_margin(MARGIN_RIGHT, ANCHOR_END, 0);
-	h_scroll->set_anchor_and_margin(MARGIN_TOP, ANCHOR_END, hmin.height);
+	h_scroll->set_anchor_and_margin(MARGIN_TOP, ANCHOR_END, -hmin.height);
 	h_scroll->set_anchor_and_margin(MARGIN_BOTTOM, ANCHOR_END, 0);
 
 	h_scroll->raise();

scene/gui/tab_container.cpp

@@ -371,8 +371,10 @@ void TabContainer::add_child_notify(Node *p_child) {
 	if (tabs_visible)
 		c->set_margin(MARGIN_TOP, _get_top_margin());
 	Ref<StyleBox> sb = get_stylebox("panel");
-	for (int i = 0; i < 4; i++)
-		c->set_margin(Margin(i), c->get_margin(Margin(i)) + sb->get_margin(Margin(i)));
+	c->set_margin(Margin(MARGIN_TOP), c->get_margin(Margin(MARGIN_TOP)) + sb->get_margin(Margin(MARGIN_TOP)));
+	c->set_margin(Margin(MARGIN_LEFT), c->get_margin(Margin(MARGIN_LEFT)) + sb->get_margin(Margin(MARGIN_LEFT)));
+	c->set_margin(Margin(MARGIN_RIGHT), c->get_margin(Margin(MARGIN_RIGHT)) - sb->get_margin(Margin(MARGIN_RIGHT)));
+	c->set_margin(Margin(MARGIN_BOTTOM), c->get_margin(Margin(MARGIN_BOTTOM)) - sb->get_margin(Margin(MARGIN_BOTTOM)));
 
 	update();
 	p_child->connect("renamed", this, "_child_renamed_callback");
@@ -402,8 +404,10 @@ void TabContainer::set_current_tab(int p_current) {
 			c->set_area_as_parent_rect();
 			if (tabs_visible)
 				c->set_margin(MARGIN_TOP, _get_top_margin());
-			for (int i = 0; i < 4; i++)
-				c->set_margin(Margin(i), c->get_margin(Margin(i)) + sb->get_margin(Margin(i)));
+			c->set_margin(Margin(MARGIN_TOP), c->get_margin(Margin(MARGIN_TOP)) + sb->get_margin(Margin(MARGIN_TOP)));
+			c->set_margin(Margin(MARGIN_LEFT), c->get_margin(Margin(MARGIN_LEFT)) + sb->get_margin(Margin(MARGIN_LEFT)));
+			c->set_margin(Margin(MARGIN_RIGHT), c->get_margin(Margin(MARGIN_RIGHT)) - sb->get_margin(Margin(MARGIN_RIGHT)));
+			c->set_margin(Margin(MARGIN_BOTTOM), c->get_margin(Margin(MARGIN_BOTTOM)) - sb->get_margin(Margin(MARGIN_BOTTOM)));
 
 		} else
 			c->hide();

scene/main/viewport.cpp

@@ -1473,8 +1473,8 @@ void Viewport::_gui_show_tooltip() {
 
 	gui.tooltip_label->set_anchor_and_margin(MARGIN_LEFT, Control::ANCHOR_BEGIN, ttp->get_margin(MARGIN_LEFT));
 	gui.tooltip_label->set_anchor_and_margin(MARGIN_TOP, Control::ANCHOR_BEGIN, ttp->get_margin(MARGIN_TOP));
-	gui.tooltip_label->set_anchor_and_margin(MARGIN_RIGHT, Control::ANCHOR_END, ttp->get_margin(MARGIN_RIGHT));
-	gui.tooltip_label->set_anchor_and_margin(MARGIN_BOTTOM, Control::ANCHOR_END, ttp->get_margin(MARGIN_BOTTOM));
+	gui.tooltip_label->set_anchor_and_margin(MARGIN_RIGHT, Control::ANCHOR_END, -ttp->get_margin(MARGIN_RIGHT));
+	gui.tooltip_label->set_anchor_and_margin(MARGIN_BOTTOM, Control::ANCHOR_END, -ttp->get_margin(MARGIN_BOTTOM));
 	gui.tooltip_label->set_text(tooltip);
 	Rect2 r(gui.tooltip_pos + Point2(10, 10), gui.tooltip_label->get_combined_minimum_size() + ttp->get_minimum_size());
 	Rect2 vr = gui.tooltip_label->get_viewport_rect();