1 files changed, 83 insertions, 357 deletions

diff --git a/scene/gui/dialogs.cpp b/scene/gui/dialogs.cpp
index 6cadd0a63e..5654219a3e 100644
--- a/scene/gui/dialogs.cpp
+++ b/scene/gui/dialogs.cpp
@@ -29,6 +29,8 @@
 /*************************************************************************/
 
 #include "dialogs.h"
+
+#include "core/os/keyboard.h"
 #include "core/print_string.h"
 #include "core/translation.h"
 #include "line_edit.h"
@@ -36,362 +38,61 @@
 #ifdef TOOLS_ENABLED
 #include "editor/editor_node.h"
 #include "editor/editor_scale.h"
-#include "scene/main/viewport.h" // Only used to check for more modals when dimming the editor.
+#include "scene/main/window.h" // Only used to check for more modals when dimming the editor.
 #endif
 
-// WindowDialog
-
-void WindowDialog::_post_popup() {
-
-	drag_type = DRAG_NONE; // just in case
-}
-
-void WindowDialog::_fix_size() {
-
-	// Perhaps this should be called when the viewport resizes as well or windows go out of bounds...
-
-	// Ensure the whole window is visible.
-	Point2i pos = get_global_position();
-	Size2i size = get_size();
-	Size2i viewport_size = get_viewport_rect().size;
-
-	// Windows require additional padding to keep the window chrome visible.
-	Ref<StyleBox> panel = get_stylebox("panel", "WindowDialog");
-	float top = 0;
-	float left = 0;
-	float bottom = 0;
-	float right = 0;
-	// Check validity, because the theme could contain a different type of StyleBox.
-	if (panel->get_class() == "StyleBoxTexture") {
-		Ref<StyleBoxTexture> panel_texture = Object::cast_to<StyleBoxTexture>(*panel);
-		top = panel_texture->get_expand_margin_size(MARGIN_TOP);
-		left = panel_texture->get_expand_margin_size(MARGIN_LEFT);
-		bottom = panel_texture->get_expand_margin_size(MARGIN_BOTTOM);
-		right = panel_texture->get_expand_margin_size(MARGIN_RIGHT);
-	} else if (panel->get_class() == "StyleBoxFlat") {
-		Ref<StyleBoxFlat> panel_flat = Object::cast_to<StyleBoxFlat>(*panel);
-		top = panel_flat->get_expand_margin_size(MARGIN_TOP);
-		left = panel_flat->get_expand_margin_size(MARGIN_LEFT);
-		bottom = panel_flat->get_expand_margin_size(MARGIN_BOTTOM);
-		right = panel_flat->get_expand_margin_size(MARGIN_RIGHT);
-	}
-
-	pos.x = MAX(left, MIN(pos.x, viewport_size.x - size.x - right));
-	pos.y = MAX(top, MIN(pos.y, viewport_size.y - size.y - bottom));
-	set_global_position(pos);
+// AcceptDialog
 
-	if (resizable) {
-		size.x = MIN(size.x, viewport_size.x - left - right);
-		size.y = MIN(size.y, viewport_size.y - top - bottom);
-		set_size(size);
+void AcceptDialog::_input_from_window(const Ref<InputEvent> &p_event) {
+	Ref<InputEventKey> key = p_event;
+	if (key.is_valid() && key->is_pressed() && key->get_keycode() == KEY_ESCAPE) {
+		_cancel_pressed();
 	}
 }
 
-bool WindowDialog::has_point(const Point2 &p_point) const {
-
-	Rect2 r(Point2(), get_size());
-
-	// Enlarge upwards for title bar.
-	int title_height = get_constant("title_height", "WindowDialog");
-	r.position.y -= title_height;
-	r.size.y += title_height;
-
-	// Inflate by the resizable border thickness.
-	if (resizable) {
-		int scaleborder_size = get_constant("scaleborder_size", "WindowDialog");
-		r.position.x -= scaleborder_size;
-		r.size.width += scaleborder_size * 2;
-		r.position.y -= scaleborder_size;
-		r.size.height += scaleborder_size * 2;
-	}
-
-	return r.has_point(p_point);
+void AcceptDialog::_parent_focused() {
+	_cancel_pressed();
 }
 
-void WindowDialog::_gui_input(const Ref<InputEvent> &p_event) {
-
-	Ref<InputEventMouseButton> mb = p_event;
-
-	if (mb.is_valid() && mb->get_button_index() == BUTTON_LEFT) {
-
-		if (mb->is_pressed()) {
-			// Begin a possible dragging operation.
-			drag_type = _drag_hit_test(Point2(mb->get_position().x, mb->get_position().y));
-			if (drag_type != DRAG_NONE)
-				drag_offset = get_global_mouse_position() - get_position();
-			drag_offset_far = get_position() + get_size() - get_global_mouse_position();
-		} else if (drag_type != DRAG_NONE && !mb->is_pressed()) {
-			// End a dragging operation.
-			drag_type = DRAG_NONE;
-		}
-	}
+void AcceptDialog::_notification(int p_what) {
 
-	Ref<InputEventMouseMotion> mm = p_event;
-
-	if (mm.is_valid()) {
-
-		if (drag_type == DRAG_NONE) {
-			// Update the cursor while moving along the borders.
-			CursorShape cursor = CURSOR_ARROW;
-			if (resizable) {
-				int preview_drag_type = _drag_hit_test(Point2(mm->get_position().x, mm->get_position().y));
-				switch (preview_drag_type) {
-					case DRAG_RESIZE_TOP:
-					case DRAG_RESIZE_BOTTOM:
-						cursor = CURSOR_VSIZE;
-						break;
-					case DRAG_RESIZE_LEFT:
-					case DRAG_RESIZE_RIGHT:
-						cursor = CURSOR_HSIZE;
-						break;
-					case DRAG_RESIZE_TOP + DRAG_RESIZE_LEFT:
-					case DRAG_RESIZE_BOTTOM + DRAG_RESIZE_RIGHT:
-						cursor = CURSOR_FDIAGSIZE;
-						break;
-					case DRAG_RESIZE_TOP + DRAG_RESIZE_RIGHT:
-					case DRAG_RESIZE_BOTTOM + DRAG_RESIZE_LEFT:
-						cursor = CURSOR_BDIAGSIZE;
-						break;
+	switch (p_what) {
+		case NOTIFICATION_VISIBILITY_CHANGED: {
+			if (is_visible()) {
+
+				get_ok()->grab_focus();
+				_update_child_rects();
+				parent_visible = get_parent_visible_window();
+				if (parent_visible) {
+					parent_visible->connect("focus_entered", callable_mp(this, &AcceptDialog::_parent_focused));
 				}
-			}
-			if (get_cursor_shape() != cursor)
-				set_default_cursor_shape(cursor);
-		} else {
-			// Update while in a dragging operation.
-			Point2 global_pos = get_global_mouse_position();
-			global_pos.y = MAX(global_pos.y, 0); // Ensure title bar stays visible.
-
-			Rect2 rect = get_rect();
-			Size2 min_size = get_combined_minimum_size();
-
-			if (drag_type == DRAG_MOVE) {
-				rect.position = global_pos - drag_offset;
 			} else {
-				if (drag_type & DRAG_RESIZE_TOP) {
-					int bottom = rect.position.y + rect.size.height;
-					int max_y = bottom - min_size.height;
-					rect.position.y = MIN(global_pos.y - drag_offset.y, max_y);
-					rect.size.height = bottom - rect.position.y;
-				} else if (drag_type & DRAG_RESIZE_BOTTOM) {
-					rect.size.height = global_pos.y - rect.position.y + drag_offset_far.y;
-				}
-				if (drag_type & DRAG_RESIZE_LEFT) {
-					int right = rect.position.x + rect.size.width;
-					int max_x = right - min_size.width;
-					rect.position.x = MIN(global_pos.x - drag_offset.x, max_x);
-					rect.size.width = right - rect.position.x;
-				} else if (drag_type & DRAG_RESIZE_RIGHT) {
-					rect.size.width = global_pos.x - rect.position.x + drag_offset_far.x;
+				if (parent_visible) {
+					parent_visible->disconnect("focus_entered", callable_mp(this, &AcceptDialog::_parent_focused));
+					parent_visible = nullptr;
 				}
 			}
 
-			set_size(rect.size);
-			set_position(rect.position);
-		}
-	}
-}
-
-void WindowDialog::_notification(int p_what) {
-
-	switch (p_what) {
-		case NOTIFICATION_DRAW: {
-			RID canvas = get_canvas_item();
-
-			// Draw the background.
-			Ref<StyleBox> panel = get_stylebox("panel");
-			Size2 size = get_size();
-			panel->draw(canvas, Rect2(0, 0, size.x, size.y));
-
-			// Draw the title bar text.
-			Ref<Font> title_font = get_font("title_font", "WindowDialog");
-			Color title_color = get_color("title_color", "WindowDialog");
-			int title_height = get_constant("title_height", "WindowDialog");
-			int font_height = title_font->get_height() - title_font->get_descent() * 2;
-			int x = (size.x - title_font->get_string_size(xl_title).x) / 2;
-			int y = (-title_height + font_height) / 2;
-			title_font->draw(canvas, Point2(x, y), xl_title, title_color, size.x - panel->get_minimum_size().x);
 		} break;
 
-		case NOTIFICATION_THEME_CHANGED:
-		case NOTIFICATION_ENTER_TREE: {
-			close_button->set_normal_texture(get_icon("close", "WindowDialog"));
-			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")));
-		} break;
-
-		case NOTIFICATION_TRANSLATION_CHANGED: {
-			String new_title = tr(title);
-			if (new_title != xl_title) {
-				xl_title = new_title;
-				minimum_size_changed();
-				update();
-			}
+		case NOTIFICATION_THEME_CHANGED: {
+			bg->add_theme_style_override("panel", bg->get_theme_stylebox("panel", "AcceptDialog"));
 		} break;
 
-		case NOTIFICATION_MOUSE_EXIT: {
-			// Reset the mouse cursor when leaving the resizable window border.
-			if (resizable && !drag_type) {
-				if (get_default_cursor_shape() != CURSOR_ARROW)
-					set_default_cursor_shape(CURSOR_ARROW);
+		case NOTIFICATION_EXIT_TREE: {
+			if (parent_visible) {
+				parent_visible->disconnect("focus_entered", callable_mp(this, &AcceptDialog::_parent_focused));
+				parent_visible = nullptr;
 			}
 		} break;
-
-#ifdef TOOLS_ENABLED
-		case NOTIFICATION_POST_POPUP: {
-			if (get_tree() && Engine::get_singleton()->is_editor_hint() && EditorNode::get_singleton()) {
-				was_editor_dimmed = EditorNode::get_singleton()->is_editor_dimmed();
-				EditorNode::get_singleton()->dim_editor(true);
+		case NOTIFICATION_READY:
+		case NOTIFICATION_WM_SIZE_CHANGED: {
+			if (is_visible()) {
+				_update_child_rects();
 			}
 		} break;
-
-		case NOTIFICATION_POPUP_HIDE: {
-			if (get_tree() && Engine::get_singleton()->is_editor_hint() && EditorNode::get_singleton() && !was_editor_dimmed) {
-				EditorNode::get_singleton()->dim_editor(false);
-				set_pass_on_modal_close_click(false);
-			}
-		} break;
-#endif
-	}
-}
-
-void WindowDialog::_closed() {
-
-	_close_pressed();
-	hide();
-}
-
-int WindowDialog::_drag_hit_test(const Point2 &pos) const {
-	int drag_type = DRAG_NONE;
-
-	if (resizable) {
-		int title_height = get_constant("title_height", "WindowDialog");
-		int scaleborder_size = get_constant("scaleborder_size", "WindowDialog");
-
-		Rect2 rect = get_rect();
-
-		if (pos.y < (-title_height + scaleborder_size))
-			drag_type = DRAG_RESIZE_TOP;
-		else if (pos.y >= (rect.size.height - scaleborder_size))
-			drag_type = DRAG_RESIZE_BOTTOM;
-		if (pos.x < scaleborder_size)
-			drag_type |= DRAG_RESIZE_LEFT;
-		else if (pos.x >= (rect.size.width - scaleborder_size))
-			drag_type |= DRAG_RESIZE_RIGHT;
-	}
-
-	if (drag_type == DRAG_NONE && pos.y < 0)
-		drag_type = DRAG_MOVE;
-
-	return drag_type;
-}
-
-void WindowDialog::set_title(const String &p_title) {
-
-	if (title != p_title) {
-		title = p_title;
-		xl_title = tr(p_title);
-		minimum_size_changed();
-		update();
-	}
-}
-String WindowDialog::get_title() const {
-
-	return title;
-}
-
-void WindowDialog::set_resizable(bool p_resizable) {
-	resizable = p_resizable;
-}
-bool WindowDialog::get_resizable() const {
-	return resizable;
-}
-
-Size2 WindowDialog::get_minimum_size() const {
-
-	Ref<Font> font = get_font("title_font", "WindowDialog");
-
-	const int button_width = close_button->get_combined_minimum_size().x;
-	const int title_width = font->get_string_size(xl_title).x;
-	const int padding = button_width / 2;
-	const int button_area = button_width + padding;
-
-	// As the title gets centered, title_width + close_button_width is not enough.
-	// We want a width w, such that w / 2 - title_width / 2 >= button_area, i.e.
-	// w >= 2 * button_area + title_width
-
-	return Size2(2 * button_area + title_width, 1);
-}
-
-TextureButton *WindowDialog::get_close_button() {
-
-	return close_button;
-}
-
-void WindowDialog::_bind_methods() {
-
-	ClassDB::bind_method(D_METHOD("_gui_input"), &WindowDialog::_gui_input);
-	ClassDB::bind_method(D_METHOD("set_title", "title"), &WindowDialog::set_title);
-	ClassDB::bind_method(D_METHOD("get_title"), &WindowDialog::get_title);
-	ClassDB::bind_method(D_METHOD("set_resizable", "resizable"), &WindowDialog::set_resizable);
-	ClassDB::bind_method(D_METHOD("get_resizable"), &WindowDialog::get_resizable);
-	ClassDB::bind_method(D_METHOD("get_close_button"), &WindowDialog::get_close_button);
-
-	ADD_PROPERTY(PropertyInfo(Variant::STRING, "window_title", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_DEFAULT_INTL), "set_title", "get_title");
-	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "resizable", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_DEFAULT_INTL), "set_resizable", "get_resizable");
-}
-
-WindowDialog::WindowDialog() {
-
-	drag_type = DRAG_NONE;
-	resizable = false;
-	close_button = memnew(TextureButton);
-	add_child(close_button);
-	close_button->connect("pressed", callable_mp(this, &WindowDialog::_closed));
-
-#ifdef TOOLS_ENABLED
-	was_editor_dimmed = false;
-#endif
-}
-
-WindowDialog::~WindowDialog() {
-}
-
-// PopupDialog
-
-void PopupDialog::_notification(int p_what) {
-
-	if (p_what == NOTIFICATION_DRAW) {
-		RID ci = get_canvas_item();
-		get_stylebox("panel")->draw(ci, Rect2(Point2(), get_size()));
-	}
-}
-
-PopupDialog::PopupDialog() {
-}
-
-PopupDialog::~PopupDialog() {
-}
-
-// AcceptDialog
-
-void AcceptDialog::_post_popup() {
-
-	WindowDialog::_post_popup();
-	get_ok()->grab_focus();
-}
-
-void AcceptDialog::_notification(int p_what) {
-
-	switch (p_what) {
-		case NOTIFICATION_MODAL_CLOSE: {
-			cancel_pressed();
-		} break;
-
-		case NOTIFICATION_READY:
-		case NOTIFICATION_RESIZED: {
-			_update_child_rects();
+		case NOTIFICATION_WM_CLOSE_REQUEST: {
+			_cancel_pressed();
 		} break;
 	}
 }
@@ -404,20 +105,28 @@ void AcceptDialog::_text_entered(const String &p_text) {
 void AcceptDialog::_ok_pressed() {
 
 	if (hide_on_ok)
-		hide();
+		set_visible(false);
 	ok_pressed();
 	emit_signal("confirmed");
 }
 
-void AcceptDialog::_close_pressed() {
+void AcceptDialog::_cancel_pressed() {
+
+	Window *parent_window = parent_visible;
+	if (parent_visible) {
+		parent_visible->disconnect("focus_entered", callable_mp(this, &AcceptDialog::_parent_focused));
+		parent_visible = nullptr;
+	}
+
+	call_deferred("hide");
+
+	emit_signal("cancelled");
 
 	cancel_pressed();
-}
 
-// FIXME: This is redundant with _closed_pressed, but there's a slight behavior
-// change (WindowDialog's _closed() also calls hide()) which should be assessed.
-void AcceptDialog::_on_close_pressed() {
-	_closed(); // From WindowDialog.
+	if (parent_window) {
+		//parent_window->grab_focus();
+	}
 }
 
 String AcceptDialog::get_text() const {
@@ -427,8 +136,10 @@ String AcceptDialog::get_text() const {
 void AcceptDialog::set_text(String p_text) {
 
 	label->set_text(p_text);
-	minimum_size_changed();
-	_update_child_rects();
+	child_controls_changed();
+	if (is_visible()) {
+		_update_child_rects();
+	}
 }
 
 void AcceptDialog::set_hide_on_ok(bool p_hide) {
@@ -463,7 +174,7 @@ void AcceptDialog::_update_child_rects() {
 	if (label->get_text().empty()) {
 		label_size.height = 0;
 	}
-	int margin = get_constant("margin", "Dialogs");
+	int margin = hbc->get_theme_constant("margin", "Dialogs");
 	Size2 size = get_size();
 	Size2 hminsize = hbc->get_combined_minimum_size();
 
@@ -475,7 +186,7 @@ void AcceptDialog::_update_child_rects() {
 		if (!c)
 			continue;
 
-		if (c == hbc || c == label || c == get_close_button() || c->is_set_as_toplevel())
+		if (c == hbc || c == label || c == bg || c->is_set_as_toplevel())
 			continue;
 
 		c->set_position(cpos);
@@ -487,11 +198,14 @@ void AcceptDialog::_update_child_rects() {
 
 	hbc->set_position(cpos);
 	hbc->set_size(csize);
+
+	bg->set_position(Point2());
+	bg->set_size(size);
 }
 
-Size2 AcceptDialog::get_minimum_size() const {
+Size2 AcceptDialog::_get_contents_minimum_size() const {
 
-	int margin = get_constant("margin", "Dialogs");
+	int margin = hbc->get_theme_constant("margin", "Dialogs");
 	Size2 minsize = label->get_combined_minimum_size();
 
 	for (int i = 0; i < get_child_count(); i++) {
@@ -499,7 +213,7 @@ Size2 AcceptDialog::get_minimum_size() const {
 		if (!c)
 			continue;
 
-		if (c == hbc || c == label || c == const_cast<AcceptDialog *>(this)->get_close_button() || c->is_set_as_toplevel())
+		if (c == hbc || c == label || c->is_set_as_toplevel())
 			continue;
 
 		Size2 cminsize = c->get_combined_minimum_size();
@@ -513,7 +227,7 @@ Size2 AcceptDialog::get_minimum_size() const {
 	minsize.x += margin * 2;
 	minsize.y += margin * 3; //one as separation between hbc and child
 
-	Size2 wmsize = WindowDialog::get_minimum_size();
+	Size2 wmsize = get_min_size();
 	minsize.x = MAX(wmsize.x, minsize.x);
 	return minsize;
 }
@@ -551,7 +265,7 @@ Button *AcceptDialog::add_cancel(const String &p_cancel) {
 	if (p_cancel == "")
 		c = RTR("Cancel");
 	Button *b = swap_ok_cancel ? add_button(c, true) : add_button(c);
-	b->connect("pressed", callable_mp(this, &AcceptDialog::_on_close_pressed));
+	b->connect("pressed", callable_mp(this, &AcceptDialog::_cancel_pressed));
 	return b;
 }
 
@@ -570,6 +284,7 @@ void AcceptDialog::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("has_autowrap"), &AcceptDialog::has_autowrap);
 
 	ADD_SIGNAL(MethodInfo("confirmed"));
+	ADD_SIGNAL(MethodInfo("cancelled"));
 	ADD_SIGNAL(MethodInfo("custom_action", PropertyInfo(Variant::STRING_NAME, "action")));
 
 	ADD_GROUP("Dialog", "dialog");
@@ -586,17 +301,27 @@ void AcceptDialog::set_swap_ok_cancel(bool p_swap) {
 
 AcceptDialog::AcceptDialog() {
 
-	int margin = get_constant("margin", "Dialogs");
-	int button_margin = get_constant("button_margin", "Dialogs");
+	parent_visible = nullptr;
+
+	set_wrap_controls(true);
+	set_visible(false);
+	set_transient(true);
+
+	bg = memnew(Panel);
+	add_child(bg);
+
+	hbc = memnew(HBoxContainer);
+
+	int margin = hbc->get_theme_constant("margin", "Dialogs");
+	int button_margin = hbc->get_theme_constant("button_margin", "Dialogs");
 
 	label = memnew(Label);
-	label->set_anchor(MARGIN_RIGHT, ANCHOR_END);
-	label->set_anchor(MARGIN_BOTTOM, ANCHOR_END);
+	label->set_anchor(MARGIN_RIGHT, Control::ANCHOR_END);
+	label->set_anchor(MARGIN_BOTTOM, Control::ANCHOR_END);
 	label->set_begin(Point2(margin, margin));
 	label->set_end(Point2(-margin, -button_margin - 10));
 	add_child(label);
 
-	hbc = memnew(HBoxContainer);
 	add_child(hbc);
 
 	hbc->add_spacer();
@@ -606,10 +331,11 @@ AcceptDialog::AcceptDialog() {
 	hbc->add_spacer();
 
 	ok->connect("pressed", callable_mp(this, &AcceptDialog::_ok_pressed));
-	set_as_toplevel(true);
 
 	hide_on_ok = true;
 	set_title(RTR("Alert!"));
+
+	connect("window_input", callable_mp(this, &AcceptDialog::_input_from_window));
 }
 
 AcceptDialog::~AcceptDialog() {
@@ -631,7 +357,7 @@ ConfirmationDialog::ConfirmationDialog() {
 
 	set_title(RTR("Please Confirm..."));
 #ifdef TOOLS_ENABLED
-	set_custom_minimum_size(Size2(200, 70) * EDSCALE);
+	set_min_size(Size2(200, 70) * EDSCALE);
 #endif
 	cancel = add_cancel();
 }