Browse Source

Merge pull request #43416 from pycbouh/graph-minimap

Add a minimap to the GraphEdit
Rémi Verschelde 4 years ago
parent
commit
c83d1b2526

+ 9 - 0
doc/classes/GraphEdit.xml

@@ -175,6 +175,15 @@
 	</methods>
 	<members>
 		<member name="focus_mode" type="int" setter="set_focus_mode" getter="get_focus_mode" override="true" enum="Control.FocusMode" default="2" />
+		<member name="minimap_enabled" type="bool" setter="set_minimap_enabled" getter="is_minimap_enabled" default="true">
+			If [code]true[/code], the minimap is visible.
+		</member>
+		<member name="minimap_opacity" type="float" setter="set_minimap_opacity" getter="get_minimap_opacity" default="0.45">
+			The opacity of the minimap rectangle.
+		</member>
+		<member name="minimap_size" type="Vector2" setter="set_minimap_size" getter="get_minimap_size" default="Vector2(240, 160)">
+			The size of the minimap rectangle. The map itself is based on the size of the grid area and is scaled to fit this rectangle.
+		</member>
 		<member name="rect_clip_content" type="bool" setter="set_clip_contents" getter="is_clipping_contents" override="true" default="true" />
 		<member name="right_disconnects" type="bool" setter="set_right_disconnects" getter="is_right_disconnects_enabled" default="false">
 			If [code]true[/code], enables disconnection of existing connections in the GraphEdit by dragging the right end.

+ 42 - 1
editor/editor_themes.cpp

@@ -85,6 +85,25 @@ static Ref<StyleBoxLine> make_line_stylebox(Color p_color, int p_thickness = 1,
 	return style;
 }
 
+static Ref<Texture2D> flip_icon(Ref<Texture2D> p_texture, bool p_flip_y = false, bool p_flip_x = false) {
+	if (!p_flip_y && !p_flip_x) {
+		return p_texture;
+	}
+
+	Ref<ImageTexture> texture(memnew(ImageTexture));
+	Ref<Image> img = p_texture->get_data();
+
+	if (p_flip_y) {
+		img->flip_y();
+	}
+	if (p_flip_x) {
+		img->flip_x();
+	}
+
+	texture->create_from_image(img);
+	return texture;
+}
+
 #ifdef MODULE_SVG_ENABLED
 static Ref<ImageTexture> editor_generate_icon(int p_index, bool p_convert_color, float p_scale = EDSCALE, bool p_force_filter = false) {
 	Ref<ImageTexture> icon = memnew(ImageTexture);
@@ -1074,11 +1093,33 @@ Ref<Theme> create_editor_theme(const Ref<Theme> p_theme) {
 	theme->set_icon("more", "GraphEdit", theme->get_icon("ZoomMore", "EditorIcons"));
 	theme->set_icon("reset", "GraphEdit", theme->get_icon("ZoomReset", "EditorIcons"));
 	theme->set_icon("snap", "GraphEdit", theme->get_icon("SnapGrid", "EditorIcons"));
+	theme->set_icon("minimap", "GraphEdit", theme->get_icon("GridMinimap", "EditorIcons"));
 	theme->set_constant("bezier_len_pos", "GraphEdit", 80 * EDSCALE);
 	theme->set_constant("bezier_len_neg", "GraphEdit", 160 * EDSCALE);
 
-	// GraphNode
+	// GraphEditMinimap
+	theme->set_stylebox("bg", "GraphEditMinimap", make_flat_stylebox(dark_color_1, 0, 0, 0, 0));
+	Ref<StyleBoxFlat> style_minimap_camera;
+	Ref<StyleBoxFlat> style_minimap_node;
+	if (dark_theme) {
+		style_minimap_camera = make_flat_stylebox(Color(0.65, 0.65, 0.65, 0.2), 0, 0, 0, 0);
+		style_minimap_camera->set_border_color(Color(0.65, 0.65, 0.65, 0.45));
+		style_minimap_node = make_flat_stylebox(Color(1, 1, 1), 0, 0, 0, 0);
+	} else {
+		style_minimap_camera = make_flat_stylebox(Color(0.38, 0.38, 0.38, 0.2), 0, 0, 0, 0);
+		style_minimap_camera->set_border_color(Color(0.38, 0.38, 0.38, 0.45));
+		style_minimap_node = make_flat_stylebox(Color(0, 0, 0), 0, 0, 0, 0);
+	}
+	style_minimap_camera->set_border_width_all(1);
+	style_minimap_node->set_corner_radius_all(1);
+	theme->set_stylebox("camera", "GraphEditMinimap", style_minimap_camera);
+	theme->set_stylebox("node", "GraphEditMinimap", style_minimap_node);
+
+	Ref<Texture2D> resizer_icon = theme->get_icon("GuiResizer", "EditorIcons");
+	theme->set_icon("resizer", "GraphEditMinimap", flip_icon(resizer_icon, true, true));
+	theme->set_color("resizer_color", "GraphEditMinimap", Color(1, 1, 1, 0.65));
 
+	// GraphNode
 	const float mv = dark_theme ? 0.0 : 1.0;
 	const float mv2 = 1.0 - mv;
 	const int gn_margin_side = 28;

+ 1 - 0
editor/icons/GridMinimap.svg

@@ -0,0 +1 @@
+<svg height="16" viewBox="0 0 16 16" width="16" xmlns="http://www.w3.org/2000/svg"><path d="m14 2.1992188v2.6152343l-2.625 1.3125v-2.6152343zm-12 4.0644531 2.625 1.3125v2.5507811l-2.625-1.3124999zm12 0v2.5507812l-2.625 1.3124999v-2.5507811zm-8 1.4550781h4v2.640625h-4zm-4 2.560547 2.625 1.3125v2.521484l-2.625-1.3125zm12 0v2.521484l-2.625 1.3125v-2.521484zm-8 1.455078h4v2.640625h-4zm1.7014535-8.109375h2.2985465v2.734375h-4.15625s-.7487346.647119-.8746377.640625c-.1310411-.0067594-1.5097373-1.4558594-1.5097373-1.4558594l-1.459375-.7296875v-2.6152343l.068419.034223s.026411-.4573464.062111-.6760553c.0346282-.2121439.1970747-.59225724.1970747-.59225724l-1.0483078-.52372301c-.0795772-.04012218-.1668141-.06276382-.2558594-.06640625-.35427845-.01325803-.64865004.27047362-.6484375.625v12c.00021484.236623.13402736.45284.34570312.558594l3.99999998 2c.086686.043505.1823067.06624.2792969.066406h6c.09699-.000166.192611-.0229.279297-.06641l4-2c.211676-.10575.345488-.321967.345703-.55859v-12c-.000468-.46423753-.488958-.76598317-.904297-.55859375l-3.869141 1.93359375h-2.9709527s.033448.4166167.015891.625c-.029188.3464401-.1950466.625-.1950468.625z" fill="#e0e0e0"/><path d="m5 6s-2.21875-2.1616704-2.21875-3.2425057c0-1.0808352 0-2.6072392 2.21875-2.6072392s2.21875 1.526404 2.21875 2.6072392c0 1.0808353-2.21875 3.2425057-2.21875 3.2425057z" fill="#fff" fill-opacity=".68627"/></svg>

+ 352 - 7
scene/gui/graph_edit.cpp

@@ -31,6 +31,7 @@
 #include "graph_edit.h"
 
 #include "core/input/input.h"
+#include "core/math/math_funcs.h"
 #include "core/os/keyboard.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/button.h"
@@ -44,6 +45,9 @@
 #define MIN_ZOOM (((1 / ZOOM_SCALE) / ZOOM_SCALE) / ZOOM_SCALE)
 #define MAX_ZOOM (1 * ZOOM_SCALE * ZOOM_SCALE * ZOOM_SCALE)
 
+#define MINIMAP_OFFSET 12
+#define MINIMAP_PADDING 5
+
 bool GraphEditFilter::has_point(const Point2 &p_point) const {
 	return ge->_filter_input(p_point);
 }
@@ -52,6 +56,141 @@ GraphEditFilter::GraphEditFilter(GraphEdit *p_edit) {
 	ge = p_edit;
 }
 
+void GraphEditMinimap::_bind_methods() {
+	ClassDB::bind_method(D_METHOD("_gui_input"), &GraphEditMinimap::_gui_input);
+}
+
+GraphEditMinimap::GraphEditMinimap(GraphEdit *p_edit) {
+	ge = p_edit;
+
+	graph_proportions = Vector2(1, 1);
+	graph_padding = Vector2(0, 0);
+	camera_position = Vector2(100, 50);
+	camera_size = Vector2(200, 200);
+	minimap_padding = Vector2(MINIMAP_PADDING, MINIMAP_PADDING);
+	minimap_offset = minimap_padding + _convert_from_graph_position(graph_padding);
+
+	is_pressing = false;
+	is_resizing = false;
+}
+
+void GraphEditMinimap::update_minimap() {
+	Vector2 graph_offset = _get_graph_offset();
+	Vector2 graph_size = _get_graph_size();
+
+	camera_position = ge->get_scroll_ofs() - graph_offset;
+	camera_size = ge->get_size();
+
+	Vector2 render_size = _get_render_size();
+	float target_ratio = render_size.x / render_size.y;
+	float graph_ratio = graph_size.x / graph_size.y;
+
+	graph_proportions = graph_size;
+	graph_padding = Vector2(0, 0);
+	if (graph_ratio > target_ratio) {
+		graph_proportions.x = graph_size.x;
+		graph_proportions.y = graph_size.x / target_ratio;
+		graph_padding.y = Math::abs(graph_size.y - graph_proportions.y) / 2;
+	} else {
+		graph_proportions.x = graph_size.y * target_ratio;
+		graph_proportions.y = graph_size.y;
+		graph_padding.x = Math::abs(graph_size.x - graph_proportions.x) / 2;
+	}
+
+	// This centers minimap inside the minimap rectangle.
+	minimap_offset = minimap_padding + _convert_from_graph_position(graph_padding);
+}
+
+Rect2 GraphEditMinimap::get_camera_rect() {
+	Vector2 camera_center = _convert_from_graph_position(camera_position + camera_size / 2) + minimap_offset;
+	Vector2 camera_viewport = _convert_from_graph_position(camera_size);
+	Vector2 camera_position = (camera_center - camera_viewport / 2);
+	return Rect2(camera_position, camera_viewport);
+}
+
+Vector2 GraphEditMinimap::_get_render_size() {
+	if (!is_inside_tree()) {
+		return Vector2(0, 0);
+	}
+
+	return get_size() - 2 * minimap_padding;
+}
+
+Vector2 GraphEditMinimap::_get_graph_offset() {
+	return Vector2(ge->h_scroll->get_min(), ge->v_scroll->get_min());
+}
+
+Vector2 GraphEditMinimap::_get_graph_size() {
+	Vector2 graph_size = Vector2(ge->h_scroll->get_max(), ge->v_scroll->get_max()) - Vector2(ge->h_scroll->get_min(), ge->v_scroll->get_min());
+
+	if (graph_size.x == 0) {
+		graph_size.x = 1;
+	}
+	if (graph_size.y == 0) {
+		graph_size.y = 1;
+	}
+
+	return graph_size;
+}
+
+Vector2 GraphEditMinimap::_convert_from_graph_position(const Vector2 &p_position) {
+	Vector2 map_position = Vector2(0, 0);
+	Vector2 render_size = _get_render_size();
+
+	map_position.x = p_position.x * render_size.x / graph_proportions.x;
+	map_position.y = p_position.y * render_size.y / graph_proportions.y;
+
+	return map_position;
+}
+
+Vector2 GraphEditMinimap::_convert_to_graph_position(const Vector2 &p_position) {
+	Vector2 graph_position = Vector2(0, 0);
+	Vector2 render_size = _get_render_size();
+
+	graph_position.x = p_position.x * graph_proportions.x / render_size.x;
+	graph_position.y = p_position.y * graph_proportions.y / render_size.y;
+
+	return graph_position;
+}
+
+void GraphEditMinimap::_gui_input(const Ref<InputEvent> &p_ev) {
+	Ref<InputEventMouseButton> mb = p_ev;
+	Ref<InputEventMouseMotion> mm = p_ev;
+
+	if (mb.is_valid() && mb->get_button_index() == BUTTON_LEFT) {
+		if (mb->is_pressed()) {
+			is_pressing = true;
+
+			Ref<Texture2D> resizer = get_theme_icon("resizer");
+			Rect2 resizer_hitbox = Rect2(Point2(), resizer->get_size());
+			if (resizer_hitbox.has_point(mb->get_position())) {
+				is_resizing = true;
+			} else {
+				Vector2 click_position = _convert_to_graph_position(mb->get_position() - minimap_padding) - graph_padding;
+				_adjust_graph_scroll(click_position);
+			}
+		} else {
+			is_pressing = false;
+			is_resizing = false;
+		}
+		accept_event();
+	} else if (mm.is_valid() && is_pressing) {
+		if (is_resizing) {
+			ge->set_minimap_size(ge->get_minimap_size() - mm->get_relative());
+			update();
+		} else {
+			Vector2 click_position = _convert_to_graph_position(mm->get_position() - minimap_padding) - graph_padding;
+			_adjust_graph_scroll(click_position);
+		}
+		accept_event();
+	}
+}
+
+void GraphEditMinimap::_adjust_graph_scroll(const Vector2 &p_offset) {
+	Vector2 graph_offset = _get_graph_offset();
+	ge->set_scroll_ofs(p_offset + graph_offset - camera_size / 2);
+}
+
 Error GraphEdit::connect_node(const StringName &p_from, int p_from_port, const StringName &p_to, int p_to_port) {
 	if (is_node_connected(p_from, p_from_port, p_to, p_to_port)) {
 		return OK;
@@ -64,6 +203,7 @@ Error GraphEdit::connect_node(const StringName &p_from, int p_from_port, const S
 	c.activity = 0;
 	connections.push_back(c);
 	top_layer->update();
+	minimap->update();
 	update();
 	connections_layer->update();
 
@@ -85,6 +225,7 @@ void GraphEdit::disconnect_node(const StringName &p_from, int p_from_port, const
 		if (E->get().from == p_from && E->get().from_port == p_from_port && E->get().to == p_to && E->get().to_port == p_to_port) {
 			connections.erase(E);
 			top_layer->update();
+			minimap->update();
 			update();
 			connections_layer->update();
 			return;
@@ -118,6 +259,7 @@ void GraphEdit::_scroll_moved(double) {
 		awaiting_scroll_offset_update = true;
 	}
 	top_layer->update();
+	minimap->update();
 	update();
 
 	if (!setting_scroll_ofs) { //in godot, signals on change value are avoided as a convention
@@ -234,6 +376,7 @@ void GraphEdit::_graph_node_moved(Node *p_gn) {
 	GraphNode *gn = Object::cast_to<GraphNode>(p_gn);
 	ERR_FAIL_COND(!gn);
 	top_layer->update();
+	minimap->update();
 	update();
 	connections_layer->update();
 }
@@ -241,7 +384,8 @@ void GraphEdit::_graph_node_moved(Node *p_gn) {
 void GraphEdit::add_child_notify(Node *p_child) {
 	Control::add_child_notify(p_child);
 
-	top_layer->call_deferred("raise"); //top layer always on top!
+	top_layer->call_deferred("raise"); // Top layer always on top!
+
 	GraphNode *gn = Object::cast_to<GraphNode>(p_child);
 	if (gn) {
 		gn->set_scale(Vector2(zoom, zoom));
@@ -255,9 +399,11 @@ void GraphEdit::add_child_notify(Node *p_child) {
 
 void GraphEdit::remove_child_notify(Node *p_child) {
 	Control::remove_child_notify(p_child);
+
 	if (is_inside_tree()) {
-		top_layer->call_deferred("raise"); //top layer always on top!
+		top_layer->call_deferred("raise"); // Top layer always on top!
 	}
+
 	GraphNode *gn = Object::cast_to<GraphNode>(p_child);
 	if (gn) {
 		gn->disconnect("offset_changed", callable_mp(this, &GraphEdit::_graph_node_moved));
@@ -275,6 +421,7 @@ void GraphEdit::_notification(int p_what) {
 		zoom_reset->set_icon(get_theme_icon("reset"));
 		zoom_plus->set_icon(get_theme_icon("more"));
 		snap_button->set_icon(get_theme_icon("snap"));
+		minimap_button->set_icon(get_theme_icon("minimap"));
 	}
 	if (p_what == NOTIFICATION_READY) {
 		Size2 hmin = h_scroll->get_combined_minimum_size();
@@ -338,6 +485,7 @@ void GraphEdit::_notification(int p_what) {
 	if (p_what == NOTIFICATION_RESIZED) {
 		_update_scroll();
 		top_layer->update();
+		minimap->update();
 	}
 }
 
@@ -472,6 +620,7 @@ void GraphEdit::_top_layer_input(const Ref<InputEvent> &p_ev) {
 		connecting_to = mm->get_position();
 		connecting_target = false;
 		top_layer->update();
+		minimap->update();
 		connecting_valid = just_disconnected || click_pos.distance_to(connecting_to) > 20.0 * zoom;
 
 		if (connecting_valid) {
@@ -541,6 +690,7 @@ void GraphEdit::_top_layer_input(const Ref<InputEvent> &p_ev) {
 
 		connecting = false;
 		top_layer->update();
+		minimap->update();
 		update();
 		connections_layer->update();
 	}
@@ -632,12 +782,12 @@ void GraphEdit::_bake_segment2d(Vector<Vector2> &points, Vector<Color> &colors,
 	}
 }
 
-void GraphEdit::_draw_cos_line(CanvasItem *p_where, const Vector2 &p_from, const Vector2 &p_to, const Color &p_color, const Color &p_to_color) {
+void GraphEdit::_draw_cos_line(CanvasItem *p_where, const Vector2 &p_from, const Vector2 &p_to, const Color &p_color, const Color &p_to_color, float p_bezier_ratio) {
 	//cubic bezier code
 	float diff = p_to.x - p_from.x;
 	float cp_offset;
-	int cp_len = get_theme_constant("bezier_len_pos");
-	int cp_neg_len = get_theme_constant("bezier_len_neg");
+	int cp_len = get_theme_constant("bezier_len_pos") * p_bezier_ratio;
+	int cp_neg_len = get_theme_constant("bezier_len_neg") * p_bezier_ratio;
 
 	if (diff > 0) {
 		cp_offset = MIN(cp_len, diff * 0.5);
@@ -708,7 +858,7 @@ void GraphEdit::_connections_layer_draw() {
 			color = color.lerp(activity_color, E->get().activity);
 			tocolor = tocolor.lerp(activity_color, E->get().activity);
 		}
-		_draw_cos_line(connections_layer, frompos, topos, color, tocolor);
+		_draw_cos_line(connections_layer, frompos, topos, color, tocolor, 1.0);
 	}
 
 	while (to_erase.size()) {
@@ -747,7 +897,7 @@ void GraphEdit::_top_layer_draw() {
 		if (!connecting_out) {
 			SWAP(pos, topos);
 		}
-		_draw_cos_line(top_layer, pos, topos, col, col);
+		_draw_cos_line(top_layer, pos, topos, col, col, 1.0);
 	}
 
 	if (box_selecting) {
@@ -756,6 +906,114 @@ void GraphEdit::_top_layer_draw() {
 	}
 }
 
+void GraphEdit::_minimap_draw() {
+	if (!is_minimap_enabled()) {
+		return;
+	}
+
+	minimap->update_minimap();
+
+	// Draw the minimap background.
+	Rect2 minimap_rect = Rect2(Point2(), minimap->get_size());
+	minimap->draw_style_box(minimap->get_theme_stylebox("bg"), minimap_rect);
+
+	Vector2 graph_offset = minimap->_get_graph_offset();
+	Vector2 minimap_offset = minimap->minimap_offset;
+
+	// Draw comment graph nodes.
+	for (int i = get_child_count() - 1; i >= 0; i--) {
+		GraphNode *gn = Object::cast_to<GraphNode>(get_child(i));
+		if (!gn || !gn->is_comment()) {
+			continue;
+		}
+
+		Vector2 node_position = minimap->_convert_from_graph_position(gn->get_offset() * zoom - graph_offset) + minimap_offset;
+		Vector2 node_size = minimap->_convert_from_graph_position(gn->get_size() * zoom);
+		Rect2 node_rect = Rect2(node_position, node_size);
+
+		Ref<StyleBoxFlat> sb_minimap = minimap->get_theme_stylebox("node")->duplicate();
+
+		// Override default values with colors provided by the GraphNode's stylebox, if possible.
+		Ref<StyleBoxFlat> sbf = gn->get_theme_stylebox(gn->is_selected() ? "commentfocus" : "comment");
+		if (sbf.is_valid()) {
+			Color node_color = sbf->get_bg_color();
+			sb_minimap->set_bg_color(node_color);
+		}
+
+		minimap->draw_style_box(sb_minimap, node_rect);
+	}
+
+	// Draw regular graph nodes.
+	for (int i = get_child_count() - 1; i >= 0; i--) {
+		GraphNode *gn = Object::cast_to<GraphNode>(get_child(i));
+		if (!gn || gn->is_comment()) {
+			continue;
+		}
+
+		Vector2 node_position = minimap->_convert_from_graph_position(gn->get_offset() * zoom - graph_offset) + minimap_offset;
+		Vector2 node_size = minimap->_convert_from_graph_position(gn->get_size() * zoom);
+		Rect2 node_rect = Rect2(node_position, node_size);
+
+		Ref<StyleBoxFlat> sb_minimap = minimap->get_theme_stylebox("node")->duplicate();
+
+		// Override default values with colors provided by the GraphNode's stylebox, if possible.
+		Ref<StyleBoxFlat> sbf = gn->get_theme_stylebox(gn->is_selected() ? "selectedframe" : "frame");
+		if (sbf.is_valid()) {
+			Color node_color = sbf->get_border_color();
+			sb_minimap->set_bg_color(node_color);
+		}
+
+		minimap->draw_style_box(sb_minimap, node_rect);
+	}
+
+	// Draw node connections.
+	Color activity_color = get_theme_color("activity");
+	for (List<Connection>::Element *E = connections.front(); E; E = E->next()) {
+		NodePath fromnp(E->get().from);
+
+		Node *from = get_node(fromnp);
+		if (!from) {
+			continue;
+		}
+		GraphNode *gfrom = Object::cast_to<GraphNode>(from);
+		if (!gfrom) {
+			continue;
+		}
+
+		NodePath tonp(E->get().to);
+		Node *to = get_node(tonp);
+		if (!to) {
+			continue;
+		}
+		GraphNode *gto = Object::cast_to<GraphNode>(to);
+		if (!gto) {
+			continue;
+		}
+
+		Vector2 from_slot_position = gfrom->get_offset() + gfrom->get_connection_output_position(E->get().from_port);
+		Vector2 from_position = minimap->_convert_from_graph_position(from_slot_position * zoom - graph_offset) + minimap_offset;
+		Color from_color = gfrom->get_connection_output_color(E->get().from_port);
+		Vector2 to_slot_position = gto->get_offset() + gto->get_connection_input_position(E->get().to_port);
+		Vector2 to_position = minimap->_convert_from_graph_position(to_slot_position * zoom - graph_offset) + minimap_offset;
+		Color to_color = gto->get_connection_input_color(E->get().to_port);
+
+		if (E->get().activity > 0) {
+			from_color = from_color.lerp(activity_color, E->get().activity);
+			to_color = to_color.lerp(activity_color, E->get().activity);
+		}
+		_draw_cos_line(minimap, from_position, to_position, from_color, to_color, 0.5);
+	}
+
+	// Draw the "camera" viewport.
+	Rect2 camera_rect = minimap->get_camera_rect();
+	minimap->draw_style_box(minimap->get_theme_stylebox("camera"), camera_rect);
+
+	// Draw the resizer control.
+	Ref<Texture2D> resizer = minimap->get_theme_icon("resizer");
+	Color resizer_color = minimap->get_theme_color("resizer_color");
+	minimap->draw_texture(resizer, Point2(), resizer_color);
+}
+
 void GraphEdit::set_selected(Node *p_child) {
 	for (int i = get_child_count() - 1; i >= 0; i--) {
 		GraphNode *gn = Object::cast_to<GraphNode>(get_child(i));
@@ -836,6 +1094,7 @@ void GraphEdit::_gui_input(const Ref<InputEvent> &p_ev) {
 		}
 
 		top_layer->update();
+		minimap->update();
 	}
 
 	Ref<InputEventMouseButton> b = p_ev;
@@ -858,10 +1117,12 @@ void GraphEdit::_gui_input(const Ref<InputEvent> &p_ev) {
 					gn->set_selected(select);
 				}
 				top_layer->update();
+				minimap->update();
 			} else {
 				if (connecting) {
 					connecting = false;
 					top_layer->update();
+					minimap->update();
 				} else {
 					emit_signal("popup_request", b->get_global_position());
 				}
@@ -902,6 +1163,7 @@ void GraphEdit::_gui_input(const Ref<InputEvent> &p_ev) {
 			dragging = false;
 
 			top_layer->update();
+			minimap->update();
 			update();
 			connections_layer->update();
 		}
@@ -1012,6 +1274,7 @@ void GraphEdit::_gui_input(const Ref<InputEvent> &p_ev) {
 			box_selecting = false;
 			previus_selected.clear();
 			top_layer->update();
+			minimap->update();
 		}
 
 		if (b->get_button_index() == BUTTON_WHEEL_UP && b->is_pressed()) {
@@ -1079,6 +1342,7 @@ void GraphEdit::set_connection_activity(const StringName &p_from, int p_from_por
 			if (Math::is_equal_approx(E->get().activity, p_activity)) {
 				//update only if changed
 				top_layer->update();
+				minimap->update();
 				connections_layer->update();
 			}
 			E->get().activity = p_activity;
@@ -1089,6 +1353,7 @@ void GraphEdit::set_connection_activity(const StringName &p_from, int p_from_por
 
 void GraphEdit::clear_connections() {
 	connections.clear();
+	minimap->update();
 	update();
 	connections_layer->update();
 }
@@ -1112,6 +1377,7 @@ void GraphEdit::set_zoom_custom(float p_zoom, const Vector2 &p_center) {
 	top_layer->update();
 
 	_update_scroll();
+	minimap->update();
 	connections_layer->update();
 
 	if (is_visible_in_tree()) {
@@ -1229,6 +1495,47 @@ void GraphEdit::_snap_value_changed(double) {
 	update();
 }
 
+// _minimap_toggled
+
+void GraphEdit::set_minimap_size(Vector2 p_size) {
+	minimap->set_size(p_size);
+	Vector2 minimap_size = minimap->get_size(); // The size might've been adjusted by the minimum size.
+
+	minimap->set_anchors_preset(Control::PRESET_BOTTOM_RIGHT);
+	minimap->set_margin(Margin::MARGIN_LEFT, -minimap_size.x - MINIMAP_OFFSET);
+	minimap->set_margin(Margin::MARGIN_TOP, -minimap_size.y - MINIMAP_OFFSET);
+	minimap->set_margin(Margin::MARGIN_RIGHT, -MINIMAP_OFFSET);
+	minimap->set_margin(Margin::MARGIN_BOTTOM, -MINIMAP_OFFSET);
+	minimap->update();
+}
+
+Vector2 GraphEdit::get_minimap_size() const {
+	return minimap->get_size();
+}
+
+void GraphEdit::set_minimap_opacity(float p_opacity) {
+	minimap->set_modulate(Color(1, 1, 1, p_opacity));
+	minimap->update();
+}
+
+float GraphEdit::get_minimap_opacity() const {
+	Color minimap_modulate = minimap->get_modulate();
+	return minimap_modulate.a;
+}
+
+void GraphEdit::set_minimap_enabled(bool p_enable) {
+	minimap_button->set_pressed(p_enable);
+	minimap->update();
+}
+
+bool GraphEdit::is_minimap_enabled() const {
+	return minimap_button->is_pressed();
+}
+
+void GraphEdit::_minimap_toggled() {
+	minimap->update();
+}
+
 HBoxContainer *GraphEdit::get_zoom_hbox() {
 	return zoom_hb;
 }
@@ -1260,6 +1567,14 @@ void GraphEdit::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_use_snap", "enable"), &GraphEdit::set_use_snap);
 	ClassDB::bind_method(D_METHOD("is_using_snap"), &GraphEdit::is_using_snap);
 
+	ClassDB::bind_method(D_METHOD("set_minimap_size", "p_size"), &GraphEdit::set_minimap_size);
+	ClassDB::bind_method(D_METHOD("get_minimap_size"), &GraphEdit::get_minimap_size);
+	ClassDB::bind_method(D_METHOD("set_minimap_opacity", "p_opacity"), &GraphEdit::set_minimap_opacity);
+	ClassDB::bind_method(D_METHOD("get_minimap_opacity"), &GraphEdit::get_minimap_opacity);
+
+	ClassDB::bind_method(D_METHOD("set_minimap_enabled", "enable"), &GraphEdit::set_minimap_enabled);
+	ClassDB::bind_method(D_METHOD("is_minimap_enabled"), &GraphEdit::is_minimap_enabled);
+
 	ClassDB::bind_method(D_METHOD("set_right_disconnects", "enable"), &GraphEdit::set_right_disconnects);
 	ClassDB::bind_method(D_METHOD("is_right_disconnects_enabled"), &GraphEdit::is_right_disconnects_enabled);
 
@@ -1275,6 +1590,10 @@ void GraphEdit::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "snap_distance"), "set_snap", "get_snap");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "use_snap"), "set_use_snap", "is_using_snap");
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "zoom"), "set_zoom", "get_zoom");
+	ADD_GROUP("Minimap", "minimap");
+	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "minimap_enabled"), "set_minimap_enabled", "is_minimap_enabled");
+	ADD_PROPERTY(PropertyInfo(Variant::VECTOR2, "minimap_size"), "set_minimap_size", "get_minimap_size");
+	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "minimap_opacity"), "set_minimap_opacity", "get_minimap_opacity");
 
 	ADD_SIGNAL(MethodInfo("connection_request", PropertyInfo(Variant::STRING_NAME, "from"), PropertyInfo(Variant::INT, "from_slot"), PropertyInfo(Variant::STRING_NAME, "to"), PropertyInfo(Variant::INT, "to_slot")));
 	ADD_SIGNAL(MethodInfo("disconnection_request", PropertyInfo(Variant::STRING_NAME, "from"), PropertyInfo(Variant::INT, "from_slot"), PropertyInfo(Variant::STRING_NAME, "to"), PropertyInfo(Variant::INT, "to_slot")));
@@ -1380,6 +1699,32 @@ GraphEdit::GraphEdit() {
 	snap_amount->connect("value_changed", callable_mp(this, &GraphEdit::_snap_value_changed));
 	zoom_hb->add_child(snap_amount);
 
+	minimap_button = memnew(Button);
+	minimap_button->set_flat(true);
+	minimap_button->set_toggle_mode(true);
+	minimap_button->set_tooltip(RTR("Enable grid minimap."));
+	minimap_button->connect("pressed", callable_mp(this, &GraphEdit::_minimap_toggled));
+	minimap_button->set_pressed(true);
+	minimap_button->set_focus_mode(FOCUS_NONE);
+	zoom_hb->add_child(minimap_button);
+
+	Vector2 minimap_size = Vector2(240, 160);
+	float minimap_opacity = 0.45;
+
+	minimap = memnew(GraphEditMinimap(this));
+	top_layer->add_child(minimap);
+	minimap->set_name("_minimap");
+	minimap->set_modulate(Color(1, 1, 1, minimap_opacity));
+	minimap->set_mouse_filter(MOUSE_FILTER_STOP);
+	minimap->set_custom_minimum_size(Vector2(50, 50));
+	minimap->set_size(minimap_size);
+	minimap->set_anchors_preset(Control::PRESET_BOTTOM_RIGHT);
+	minimap->set_margin(Margin::MARGIN_LEFT, -minimap_size.x - MINIMAP_OFFSET);
+	minimap->set_margin(Margin::MARGIN_TOP, -minimap_size.y - MINIMAP_OFFSET);
+	minimap->set_margin(Margin::MARGIN_RIGHT, -MINIMAP_OFFSET);
+	minimap->set_margin(Margin::MARGIN_BOTTOM, -MINIMAP_OFFSET);
+	minimap->connect("draw", callable_mp(this, &GraphEdit::_minimap_draw));
+
 	setting_scroll_ofs = false;
 	just_disconnected = false;
 	set_clip_contents(true);

+ 57 - 1
scene/gui/graph_edit.h

@@ -45,6 +45,7 @@ class GraphEditFilter : public Control {
 	GDCLASS(GraphEditFilter, Control);
 
 	friend class GraphEdit;
+	friend class GraphEditMinimap;
 	GraphEdit *ge;
 	virtual bool has_point(const Point2 &p_point) const override;
 
@@ -52,6 +53,45 @@ public:
 	GraphEditFilter(GraphEdit *p_edit);
 };
 
+class GraphEditMinimap : public Control {
+	GDCLASS(GraphEditMinimap, Control);
+
+	friend class GraphEdit;
+	friend class GraphEditFilter;
+	GraphEdit *ge;
+
+protected:
+	static void _bind_methods();
+
+public:
+	GraphEditMinimap(GraphEdit *p_edit);
+
+	void update_minimap();
+	Rect2 get_camera_rect();
+
+private:
+	Vector2 minimap_padding;
+	Vector2 minimap_offset;
+	Vector2 graph_proportions;
+	Vector2 graph_padding;
+	Vector2 camera_position;
+	Vector2 camera_size;
+
+	bool is_pressing;
+	bool is_resizing;
+
+	Vector2 _get_render_size();
+	Vector2 _get_graph_offset();
+	Vector2 _get_graph_size();
+
+	Vector2 _convert_from_graph_position(const Vector2 &p_position);
+	Vector2 _convert_to_graph_position(const Vector2 &p_position);
+
+	void _gui_input(const Ref<InputEvent> &p_ev);
+
+	void _adjust_graph_scroll(const Vector2 &p_offset);
+};
+
 class GraphEdit : public Control {
 	GDCLASS(GraphEdit, Control);
 
@@ -72,6 +112,8 @@ private:
 	Button *snap_button;
 	SpinBox *snap_amount;
 
+	Button *minimap_button;
+
 	void _zoom_minus();
 	void _zoom_reset();
 	void _zoom_plus();
@@ -118,7 +160,7 @@ private:
 
 	void _bake_segment2d(Vector<Vector2> &points, Vector<Color> &colors, float p_begin, float p_end, const Vector2 &p_a, const Vector2 &p_out, const Vector2 &p_b, const Vector2 &p_in, int p_depth, int p_min_depth, int p_max_depth, float p_tol, const Color &p_color, const Color &p_to_color, int &lines) const;
 
-	void _draw_cos_line(CanvasItem *p_where, const Vector2 &p_from, const Vector2 &p_to, const Color &p_color, const Color &p_to_color);
+	void _draw_cos_line(CanvasItem *p_where, const Vector2 &p_from, const Vector2 &p_to, const Color &p_color, const Color &p_to_color, float p_bezier_ratio);
 
 	void _graph_node_raised(Node *p_gn);
 	void _graph_node_moved(Node *p_gn);
@@ -129,12 +171,14 @@ private:
 
 	Control *connections_layer;
 	GraphEditFilter *top_layer;
+	GraphEditMinimap *minimap;
 	void _top_layer_input(const Ref<InputEvent> &p_ev);
 
 	bool is_in_hot_zone(const Vector2 &pos, const Vector2 &p_mouse_pos);
 
 	void _top_layer_draw();
 	void _connections_layer_draw();
+	void _minimap_draw();
 	void _update_scroll_offset();
 
 	Array _get_connection_list() const;
@@ -171,6 +215,9 @@ private:
 	void _snap_toggled();
 	void _snap_value_changed(double);
 
+	friend class GraphEditMinimap;
+	void _minimap_toggled();
+
 	bool _check_clickable_control(Control *p_control, const Vector2 &pos);
 
 protected:
@@ -196,7 +243,16 @@ public:
 	void set_zoom_custom(float p_zoom, const Vector2 &p_center);
 	float get_zoom() const;
 
+	void set_minimap_size(Vector2 p_size);
+	Vector2 get_minimap_size() const;
+	void set_minimap_opacity(float p_opacity);
+	float get_minimap_opacity() const;
+
+	void set_minimap_enabled(bool p_enable);
+	bool is_minimap_enabled() const;
+
 	GraphEditFilter *get_top_layer() const { return top_layer; }
+	GraphEditMinimap *get_minimap() const { return minimap; }
 	void get_connection_list(List<Connection> *r_connections) const;
 
 	void set_right_disconnects(bool p_enable);

+ 44 - 0
scene/resources/default_theme/default_theme.cpp

@@ -77,6 +77,17 @@ static Ref<StyleBoxTexture> make_stylebox(T p_src, float p_left, float p_top, fl
 	return style;
 }
 
+static Ref<StyleBoxFlat> make_flat_stylebox(Color p_color, float p_margin_left = -1, float p_margin_top = -1, float p_margin_right = -1, float p_margin_bottom = -1) {
+	Ref<StyleBoxFlat> style(memnew(StyleBoxFlat));
+	style->set_bg_color(p_color);
+	style->set_default_margin(MARGIN_LEFT, p_margin_left * scale);
+	style->set_default_margin(MARGIN_RIGHT, p_margin_right * scale);
+	style->set_default_margin(MARGIN_BOTTOM, p_margin_bottom * scale);
+	style->set_default_margin(MARGIN_TOP, p_margin_top * scale);
+
+	return style;
+}
+
 static Ref<StyleBoxTexture> sb_expand(Ref<StyleBoxTexture> p_sbox, float p_left, float p_top, float p_right, float p_botton) {
 	p_sbox->set_expand_margin_size(MARGIN_LEFT, p_left * scale);
 	p_sbox->set_expand_margin_size(MARGIN_TOP, p_top * scale);
@@ -97,6 +108,25 @@ static Ref<Texture2D> make_icon(T p_src) {
 	return texture;
 }
 
+static Ref<Texture2D> flip_icon(Ref<Texture2D> p_texture, bool p_flip_y = false, bool p_flip_x = false) {
+	if (!p_flip_y && !p_flip_x) {
+		return p_texture;
+	}
+
+	Ref<ImageTexture> texture(memnew(ImageTexture));
+	Ref<Image> img = p_texture->get_data();
+
+	if (p_flip_y) {
+		img->flip_y();
+	}
+	if (p_flip_x) {
+		img->flip_x();
+	}
+
+	texture->create_from_image(img);
+	return texture;
+}
+
 static Ref<StyleBox> make_empty_stylebox(float p_margin_left = -1, float p_margin_top = -1, float p_margin_right = -1, float p_margin_botton = -1) {
 	Ref<StyleBox> style(memnew(StyleBoxEmpty));
 
@@ -854,6 +884,7 @@ void fill_default_theme(Ref<Theme> &theme, const Ref<Font> &default_font, const
 	theme->set_icon("reset", "GraphEdit", make_icon(icon_zoom_reset_png));
 	theme->set_icon("more", "GraphEdit", make_icon(icon_zoom_more_png));
 	theme->set_icon("snap", "GraphEdit", make_icon(icon_snap_grid_png));
+	theme->set_icon("minimap", "GraphEdit", make_icon(icon_grid_minimap_png));
 	theme->set_stylebox("bg", "GraphEdit", make_stylebox(tree_bg_png, 4, 4, 4, 5));
 	theme->set_color("grid_minor", "GraphEdit", Color(1, 1, 1, 0.05));
 	theme->set_color("grid_major", "GraphEdit", Color(1, 1, 1, 0.2));
@@ -867,6 +898,19 @@ void fill_default_theme(Ref<Theme> &theme, const Ref<Font> &default_font, const
 	theme->set_constant("port_grab_distance_horizontal", "GraphEdit", 48 * scale);
 	theme->set_constant("port_grab_distance_vertical", "GraphEdit", 6 * scale);
 
+	theme->set_stylebox("bg", "GraphEditMinimap", make_flat_stylebox(Color(0.24, 0.24, 0.24), 0, 0, 0, 0));
+	Ref<StyleBoxFlat> style_minimap_camera = make_flat_stylebox(Color(0.65, 0.65, 0.65, 0.2), 0, 0, 0, 0);
+	style_minimap_camera->set_border_color(Color(0.65, 0.65, 0.65, 0.45));
+	style_minimap_camera->set_border_width_all(1);
+	theme->set_stylebox("camera", "GraphEditMinimap", style_minimap_camera);
+	Ref<StyleBoxFlat> style_minimap_node = make_flat_stylebox(Color(1, 1, 1), 0, 0, 0, 0);
+	style_minimap_node->set_corner_radius_all(2);
+	theme->set_stylebox("node", "GraphEditMinimap", style_minimap_node);
+
+	Ref<Texture2D> resizer_icon = make_icon(window_resizer_png);
+	theme->set_icon("resizer", "GraphEditMinimap", flip_icon(resizer_icon, true, true));
+	theme->set_color("resizer_color", "GraphEditMinimap", Color(1, 1, 1, 0.85));
+
 	// Theme
 
 	default_icon = make_icon(error_icon_png);

BIN
scene/resources/default_theme/icon_grid_minimap.png


File diff suppressed because it is too large
+ 1 - 0
scene/resources/default_theme/theme_data.h


Some files were not shown because too many files changed in this diff