Reworked tooltips to use the popup system.

4 files changed, 82 insertions, 44 deletions

diff --git a/scene/main/viewport.cpp b/scene/main/viewport.cpp
index b809dc4d3a..309c9ee47d 100644
--- a/scene/main/viewport.cpp
+++ b/scene/main/viewport.cpp
@@ -168,9 +168,9 @@ ViewportTexture::~ViewportTexture() {
 
 /////////////////////////////////////
 
-class TooltipPanel : public PanelContainer {
+class TooltipPanel : public PopupPanel {
 
-	GDCLASS(TooltipPanel, PanelContainer);
+	GDCLASS(TooltipPanel, PopupPanel);
 
 public:
 	TooltipPanel(){};
@@ -328,6 +328,7 @@ void Viewport::_sub_window_grab_focus(Window *p_window) {
 
 		return;
 	}
+
 	int index = -1;
 	for (int i = 0; i < gui.sub_windows.size(); i++) {
 		if (gui.sub_windows[i].window == p_window) {
@@ -338,6 +339,16 @@ void Viewport::_sub_window_grab_focus(Window *p_window) {
 
 	ERR_FAIL_COND(index == -1);
 
+	if (p_window->get_flag(Window::FLAG_NO_FOCUS)) {
+		//can only move to foreground, but no focus granted
+		SubWindow sw = gui.sub_windows[index];
+		gui.sub_windows.remove(index);
+		gui.sub_windows.push_back(sw);
+		index = gui.sub_windows.size() - 1;
+		_sub_window_update_order();
+		return; //i guess not...
+	}
+
 	if (gui.subwindow_focused) {
 		if (gui.subwindow_focused == p_window) {
 			return; //nothing to do
@@ -1587,47 +1598,49 @@ void Viewport::_gui_show_tooltip() {
 
 	Control *rp = which;
 
-	gui.tooltip_popup = which->make_custom_tooltip(tooltip);
-
-	if (!gui.tooltip_popup) {
-		gui.tooltip_popup = memnew(TooltipPanel);
+	Control *base_tooltip = which->make_custom_tooltip(tooltip);
 
+	if (!base_tooltip) {
 		gui.tooltip_label = memnew(TooltipLabel);
-		gui.tooltip_popup->add_child(gui.tooltip_label);
-
-		Ref<StyleBox> ttp = gui.tooltip_label->get_theme_stylebox("panel", "TooltipPanel");
-
-		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_text(tooltip);
+		base_tooltip = gui.tooltip_label;
 	}
 
+	base_tooltip->set_anchors_and_margins_preset(Control::PRESET_WIDE);
+
+	TooltipPanel *panel = memnew(TooltipPanel);
+	panel->set_transient(false);
+	panel->set_flag(Window::FLAG_NO_FOCUS, true);
+	panel->set_wrap_controls(true);
+	panel->add_child(base_tooltip);
+
+	gui.tooltip_popup = panel;
+
 	rp->add_child(gui.tooltip_popup);
-	gui.tooltip_popup->force_parent_owned();
-	gui.tooltip_popup->set_as_toplevel(true);
-	if (gui.tooltip) // Avoids crash when rapidly switching controls.
-		gui.tooltip_popup->set_scale(gui.tooltip->get_global_transform().get_scale());
+
+	//if (gui.tooltip) // Avoids crash when rapidly switching controls.
+	//	gui.tooltip_popup->set_scale(gui.tooltip->get_global_transform().get_scale());
 
 	Point2 tooltip_offset = ProjectSettings::get_singleton()->get("display/mouse_cursor/tooltip_position_offset");
-	Rect2 r(gui.tooltip_pos + tooltip_offset, gui.tooltip_popup->get_minimum_size());
-	Rect2 vr = gui.tooltip_popup->get_viewport_rect();
-	if (r.size.x * gui.tooltip_popup->get_scale().x + r.position.x > vr.size.x)
-		r.position.x = vr.size.x - r.size.x * gui.tooltip_popup->get_scale().x;
-	else if (r.position.x < 0)
-		r.position.x = 0;
-
-	if (r.size.y * gui.tooltip_popup->get_scale().y + r.position.y > vr.size.y)
-		r.position.y = vr.size.y - r.size.y * gui.tooltip_popup->get_scale().y;
-	else if (r.position.y < 0)
-		r.position.y = 0;
-
-	gui.tooltip_popup->set_global_position(r.position);
+	Rect2 r(gui.tooltip_pos + tooltip_offset, gui.tooltip_popup->get_contents_minimum_size());
+
+	Rect2i vr = gui.tooltip_popup->get_parent_visible_window()->get_usable_parent_rect();
+
+	if (r.size.x + r.position.x > vr.size.x + vr.position.x)
+		r.position.x = vr.position.x + vr.size.x - r.size.x;
+	else if (r.position.x < vr.position.x)
+		r.position.x = vr.position.x;
+
+	if (r.size.y + r.position.y > vr.size.y + vr.position.y)
+		r.position.y = vr.position.y + vr.size.y - r.size.y;
+	else if (r.position.y < vr.position.y)
+		r.position.y = vr.position.y;
+
+	gui.tooltip_popup->set_position(r.position);
 	gui.tooltip_popup->set_size(r.size);
 
-	gui.tooltip_popup->raise();
 	gui.tooltip_popup->show();
+	gui.tooltip_popup->child_controls_changed();
 }
 
 void Viewport::_gui_call_input(Control *p_control, const Ref<InputEvent> &p_input) {
@@ -1761,9 +1774,6 @@ Control *Viewport::_gui_find_control_at_pos(CanvasItem *p_node, const Point2 &p_
 
 		for (int i = p_node->get_child_count() - 1; i >= 0; i--) {
 
-			if (p_node == gui.tooltip_popup)
-				continue;
-
 			CanvasItem *ci = Object::cast_to<CanvasItem>(p_node->get_child(i));
 			if (!ci || ci->is_set_as_toplevel())
 				continue;
@@ -2125,8 +2135,17 @@ void Viewport::_gui_input_event(Ref<InputEvent> p_event) {
 						if (tooltip == gui.tooltip_label->get_text()) {
 							is_tooltip_shown = true;
 						}
-					} else if (tooltip == String(gui.tooltip_popup->call("get_tooltip_text"))) {
-						is_tooltip_shown = true;
+					} else {
+
+						Variant t = gui.tooltip_popup->call("get_tooltip_text");
+
+						if (t.get_type() == Variant::STRING) {
+							if (tooltip == String(t)) {
+								is_tooltip_shown = true;
+							}
+						} else {
+							is_tooltip_shown = true; //well, nothing to compare against, likely using custom control, so if it changes there is nothing we can do
+						}
 					}
 				} else
 					_gui_cancel_tooltip();
@@ -2135,7 +2154,7 @@ void Viewport::_gui_input_event(Ref<InputEvent> p_event) {
 			if (can_tooltip && !is_tooltip_shown) {
 
 				gui.tooltip = over;
-				gui.tooltip_pos = mpos; //(parent_xform * get_transform()).affine_inverse().xform(pos);
+				gui.tooltip_pos = over->get_screen_transform().xform(pos); //(parent_xform * get_transform()).affine_inverse().xform(pos);
 				gui.tooltip_timer = gui.tooltip_delay;
 			}
 		}
@@ -2444,9 +2463,6 @@ void Viewport::_gui_remove_control(Control *p_control) {
 		gui.mouse_over = NULL;
 	if (gui.tooltip == p_control)
 		gui.tooltip = NULL;
-	if (gui.tooltip_popup == p_control) {
-		_gui_cancel_tooltip();
-	}
 }
 
 void Viewport::_gui_remove_focus() {
diff --git a/scene/main/viewport.h b/scene/main/viewport.h
index 5065ebef1a..e9c5a05ce2 100644
--- a/scene/main/viewport.h
+++ b/scene/main/viewport.h
@@ -311,7 +311,7 @@ private:
 		Control *key_focus;
 		Control *mouse_over;
 		Control *tooltip;
-		Control *tooltip_popup;
+		Window *tooltip_popup;
 		Label *tooltip_label;
 		Point2 tooltip_pos;
 		Point2 last_mouse_pos;
diff --git a/scene/main/window.cpp b/scene/main/window.cpp
index 4b5710e8a4..ea6d4a46bd 100644
--- a/scene/main/window.cpp
+++ b/scene/main/window.cpp
@@ -1061,7 +1061,6 @@ Rect2i Window::get_usable_parent_rect() const {
 	Rect2i parent;
 	if (is_embedded()) {
 		parent = _get_embedder()->get_visible_rect();
-		print_line("using embedded " + parent);
 	} else {
 
 		const Window *w = is_visible() ? this : get_parent_visible_window();
@@ -1069,7 +1068,6 @@ Rect2i Window::get_usable_parent_rect() const {
 		ERR_FAIL_COND_V(!w, Rect2());
 
 		parent = DisplayServer::get_singleton()->screen_get_usable_rect(DisplayServer::get_singleton()->window_get_current_screen(w->get_window_id()));
-		print_line("using windowid " + parent);
 	}
 	return parent;
 }
@@ -1337,6 +1335,7 @@ void Window::_bind_methods() {
 	ADD_PROPERTYI(PropertyInfo(Variant::BOOL, "borderless"), "set_flag", "get_flag", FLAG_BORDERLESS);
 	ADD_PROPERTYI(PropertyInfo(Variant::BOOL, "always_on_top"), "set_flag", "get_flag", FLAG_ALWAYS_ON_TOP);
 	ADD_PROPERTYI(PropertyInfo(Variant::BOOL, "transparent"), "set_flag", "get_flag", FLAG_TRANSPARENT);
+	ADD_PROPERTYI(PropertyInfo(Variant::BOOL, "unfocusable"), "set_flag", "get_flag", FLAG_NO_FOCUS);
 	ADD_GROUP("Limits", "");
 	ADD_PROPERTY(PropertyInfo(Variant::VECTOR2I, "min_size"), "set_min_size", "get_min_size");
 	ADD_PROPERTY(PropertyInfo(Variant::VECTOR2I, "max_size"), "set_max_size", "get_max_size");
@@ -1360,6 +1359,28 @@ void Window::_bind_methods() {
 	ADD_SIGNAL(MethodInfo("about_to_popup"));
 
 	BIND_CONSTANT(NOTIFICATION_VISIBILITY_CHANGED);
+
+	BIND_ENUM_CONSTANT(MODE_WINDOWED);
+	BIND_ENUM_CONSTANT(MODE_MINIMIZED);
+	BIND_ENUM_CONSTANT(MODE_MAXIMIZED);
+	BIND_ENUM_CONSTANT(MODE_FULLSCREEN);
+
+	BIND_ENUM_CONSTANT(FLAG_RESIZE_DISABLED);
+	BIND_ENUM_CONSTANT(FLAG_BORDERLESS);
+	BIND_ENUM_CONSTANT(FLAG_ALWAYS_ON_TOP);
+	BIND_ENUM_CONSTANT(FLAG_TRANSPARENT);
+	BIND_ENUM_CONSTANT(FLAG_NO_FOCUS);
+	BIND_ENUM_CONSTANT(FLAG_MAX);
+
+	BIND_ENUM_CONSTANT(CONTENT_SCALE_MODE_DISABLED);
+	BIND_ENUM_CONSTANT(CONTENT_SCALE_MODE_OBJECTS);
+	BIND_ENUM_CONSTANT(CONTENT_SCALE_MODE_PIXELS);
+
+	BIND_ENUM_CONSTANT(CONTENT_SCALE_ASPECT_IGNORE);
+	BIND_ENUM_CONSTANT(CONTENT_SCALE_ASPECT_KEEP);
+	BIND_ENUM_CONSTANT(CONTENT_SCALE_ASPECT_KEEP_WIDTH);
+	BIND_ENUM_CONSTANT(CONTENT_SCALE_ASPECT_KEEP_HEIGHT);
+	BIND_ENUM_CONSTANT(CONTENT_SCALE_ASPECT_EXPAND);
 }
 
 Window::Window() {
diff --git a/scene/main/window.h b/scene/main/window.h
index 77bbfec8d8..df67cabeaa 100644
--- a/scene/main/window.h
+++ b/scene/main/window.h
@@ -51,6 +51,7 @@ public:
 		FLAG_BORDERLESS = DisplayServer::WINDOW_FLAG_BORDERLESS,
 		FLAG_ALWAYS_ON_TOP = DisplayServer::WINDOW_FLAG_ALWAYS_ON_TOP,
 		FLAG_TRANSPARENT = DisplayServer::WINDOW_FLAG_TRANSPARENT,
+		FLAG_NO_FOCUS = DisplayServer::WINDOW_FLAG_NO_FOCUS,
 		FLAG_MAX = DisplayServer::WINDOW_FLAG_MAX,
 	};