summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémi Verschelde <remi@verschelde.fr>2021-03-20 17:51:50 +0100
committerGitHub <noreply@github.com>2021-03-20 17:51:50 +0100
commitc655ed7926c051116cf0cb33a29e6a506298a820 (patch)
tree20786413df562084f0da47eba3279eacdb87a756
parent08a0a935da3019a32c658231aea937d7e2cc9000 (diff)
parent045f55ec00d7358cc496474fd68ab47bda9a83a7 (diff)
Merge pull request #47193 from jmb462/prevent-resizing-minimap-bigger-than-GraphEdit
Prevent resizing minimap bigger than GraphEdit (Fix #47189)
-rw-r--r--scene/gui/graph_edit.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/scene/gui/graph_edit.cpp b/scene/gui/graph_edit.cpp
index 09a9cbf95b..71d31434d4 100644
--- a/scene/gui/graph_edit.cpp
+++ b/scene/gui/graph_edit.cpp
@@ -180,7 +180,12 @@ void GraphEditMinimap::_gui_input(const Ref<InputEvent> &p_ev) {
accept_event();
} else if (mm.is_valid() && is_pressing) {
if (is_resizing) {
- ge->set_minimap_size(ge->get_minimap_size() - mm->get_relative());
+ // Prevent setting minimap wider than GraphEdit
+ Vector2 new_minimap_size;
+ new_minimap_size.x = MIN(get_size().x - mm->get_relative().x, ge->get_size().x - 2.0 * minimap_padding.x);
+ new_minimap_size.y = MIN(get_size().y - mm->get_relative().y, ge->get_size().y - 2.0 * minimap_padding.y);
+ ge->set_minimap_size(new_minimap_size);
+
update();
} else {
Vector2 click_position = _convert_to_graph_position(mm->get_position() - minimap_padding) - graph_padding;