godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-11 13:10:58 +00:00
Code Releases Wiki Activity

[GraphEdit] Improve UI control scheme by separating scroll_offset from scroll bars

Browse Source
This commit is contained in:
Hendrik Brucker
2025-04-29 21:35:21 +02:00
parent 666d7c030b
commit b55b9fe352
2 changed files with 46 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
scene/gui/graph_edit.cpp
View File

@@ -115,11 +115,11 @@ Vector2 GraphEditMinimap::_get_render_size() {
} }
Vector2 GraphEditMinimap::_get_graph_offset() { Vector2 GraphEditMinimap::_get_graph_offset() {
return Vector2(ge->h_scrollbar->get_min(), ge->v_scrollbar->get_min()); return ge->min_scroll_offset;
} }
Vector2 GraphEditMinimap::_get_graph_size() { Vector2 GraphEditMinimap::_get_graph_size() {
Vector2 graph_size = Vector2(ge->h_scrollbar->get_max(), ge->v_scrollbar->get_max()) - Vector2(ge->h_scrollbar->get_min(), ge->v_scrollbar->get_min()); Vector2 graph_size = ge->max_scroll_offset - ge->min_scroll_offset;
if (graph_size.width == 0) { if (graph_size.width == 0) {
graph_size.width = 1; graph_size.width = 1;
@@ -411,17 +411,25 @@ String GraphEdit::get_connections_description(const StringName &p_node, int p_po
void GraphEdit::set_scroll_offset(const Vector2 &p_offset) { void GraphEdit::set_scroll_offset(const Vector2 &p_offset) {
setting_scroll_offset = true; setting_scroll_offset = true;
h_scrollbar->set_value(p_offset.x); scroll_offset = p_offset.clamp(min_scroll_offset, max_scroll_offset - get_size());
v_scrollbar->set_value(p_offset.y); if (!awaiting_scroll_offset_update) {
_update_scroll(); callable_mp(this, &GraphEdit::_update_scroll_offset).call_deferred();
awaiting_scroll_offset_update = true;
}
minimap->queue_redraw();
queue_redraw();
_update_scrollbars();
callable_mp(this, &GraphEdit::_update_top_connection_layer).call_deferred();
setting_scroll_offset = false; setting_scroll_offset = false;
} }
Vector2 GraphEdit::get_scroll_offset() const { Vector2 GraphEdit::get_scroll_offset() const {
return Vector2(h_scrollbar->get_value(), v_scrollbar->get_value()); return scroll_offset;
} }
void GraphEdit::_scroll_moved(double) { void GraphEdit::_scrollbar_moved(double) {
scroll_offset.x = h_scrollbar->get_value();
scroll_offset.y = v_scrollbar->get_value();
if (!awaiting_scroll_offset_update) { if (!awaiting_scroll_offset_update) {
callable_mp(this, &GraphEdit::_update_scroll_offset).call_deferred(); callable_mp(this, &GraphEdit::_update_scroll_offset).call_deferred();
awaiting_scroll_offset_update = true; awaiting_scroll_offset_update = true;
@@ -443,14 +451,14 @@ void GraphEdit::_update_scroll_offset() {
} }
Point2 pos = graph_element->get_position_offset() * zoom; Point2 pos = graph_element->get_position_offset() * zoom;
pos -= Point2(h_scrollbar->get_value(), v_scrollbar->get_value()); pos -= scroll_offset;
graph_element->set_position(pos); graph_element->set_position(pos);
if (graph_element->get_scale() != Vector2(zoom, zoom)) { if (graph_element->get_scale() != Vector2(zoom, zoom)) {
graph_element->set_scale(Vector2(zoom, zoom)); graph_element->set_scale(Vector2(zoom, zoom));
} }
} }
connections_layer->set_position(-Point2(h_scrollbar->get_value(), v_scrollbar->get_value())); connections_layer->set_position(-scroll_offset);
set_block_minimum_size_adjust(false); set_block_minimum_size_adjust(false);
awaiting_scroll_offset_update = false; awaiting_scroll_offset_update = false;
@@ -460,14 +468,18 @@ void GraphEdit::_update_scroll_offset() {
} }
} }
void GraphEdit::_update_scroll() { void GraphEdit::_update_scrollbars() {
if (updating) { if (updating) {
return; return;
} }
updating = true; updating = true;
h_scrollbar->set_value_no_signal(scroll_offset.x);
v_scrollbar->set_value_no_signal(scroll_offset.y);
set_block_minimum_size_adjust(true); set_block_minimum_size_adjust(true);
// Determine the graph "canvas" size in screen space.
Rect2 screen_rect; Rect2 screen_rect;
for (int i = 0; i < get_child_count(); i++) { for (int i = 0; i < get_child_count(); i++) {
GraphElement *graph_element = Object::cast_to<GraphElement>(get_child(i)); GraphElement *graph_element = Object::cast_to<GraphElement>(get_child(i));
@@ -484,6 +496,9 @@ void GraphEdit::_update_scroll() {
screen_rect.position -= get_size(); screen_rect.position -= get_size();
screen_rect.size += get_size() * 2.0; screen_rect.size += get_size() * 2.0;
min_scroll_offset = screen_rect.position;
max_scroll_offset = screen_rect.position + screen_rect.size;
h_scrollbar->set_min(screen_rect.position.x); h_scrollbar->set_min(screen_rect.position.x);
h_scrollbar->set_max(screen_rect.position.x + screen_rect.size.width); h_scrollbar->set_max(screen_rect.position.x + screen_rect.size.width);
h_scrollbar->set_page(get_size().x); h_scrollbar->set_page(get_size().x);
@@ -849,7 +864,7 @@ void GraphEdit::_notification(int p_what) {
} break; } break;
case NOTIFICATION_RESIZED: { case NOTIFICATION_RESIZED: {
_update_scroll(); _update_scrollbars();
minimap->queue_redraw(); minimap->queue_redraw();
callable_mp(this, &GraphEdit::_update_top_connection_layer).call_deferred(); callable_mp(this, &GraphEdit::_update_top_connection_layer).call_deferred();
} break; } break;
@@ -1714,7 +1729,7 @@ void GraphEdit::_top_layer_draw() {
} }
void GraphEdit::_update_top_connection_layer() { void GraphEdit::_update_top_connection_layer() {
_update_scroll(); _update_scrollbars();
if (!connecting) { if (!connecting) {
dragged_connection_line->clear_points(); dragged_connection_line->clear_points();
@@ -2302,9 +2317,15 @@ void GraphEdit::key_input(const Ref<InputEvent> &p_ev) {
void GraphEdit::_pan_callback(Vector2 p_scroll_vec, Ref<InputEvent> p_event) { void GraphEdit::_pan_callback(Vector2 p_scroll_vec, Ref<InputEvent> p_event) {
ERR_FAIL_NULL_MSG(connections_layer, "connections_layer is missing."); ERR_FAIL_NULL_MSG(connections_layer, "connections_layer is missing.");
h_scrollbar->set_value(h_scrollbar->get_value() - p_scroll_vec.x); scroll_offset = (scroll_offset - p_scroll_vec).clamp(min_scroll_offset, max_scroll_offset - get_size());
v_scrollbar->set_value(v_scrollbar->get_value() - p_scroll_vec.y);
if (!awaiting_scroll_offset_update) {
callable_mp(this, &GraphEdit::_update_scroll_offset).call_deferred();
awaiting_scroll_offset_update = true;
}
minimap->queue_redraw();
queue_redraw();
callable_mp(this, &GraphEdit::_update_top_connection_layer).call_deferred();
connections_layer->queue_redraw(); connections_layer->queue_redraw();
} }
@@ -2406,7 +2427,7 @@ void GraphEdit::set_zoom_custom(float p_zoom, const Vector2 &p_center) {
return; return;
} }
Vector2 scrollbar_offset = (Vector2(h_scrollbar->get_value(), v_scrollbar->get_value()) + p_center) / zoom; Point2 zoom_anchor = (scroll_offset + p_center) / zoom;
zoom = p_zoom; zoom = p_zoom;
@@ -2415,14 +2436,12 @@ void GraphEdit::set_zoom_custom(float p_zoom, const Vector2 &p_center) {
zoom_minus_button->set_disabled(zoom == zoom_min); zoom_minus_button->set_disabled(zoom == zoom_min);
zoom_plus_button->set_disabled(zoom == zoom_max); zoom_plus_button->set_disabled(zoom == zoom_max);
_update_scroll(); _update_scrollbars();
minimap->queue_redraw(); minimap->queue_redraw();
connections_layer->queue_redraw(); connections_layer->queue_redraw();
if (is_visible_in_tree()) { if (is_visible_in_tree()) {
Vector2 offset = scrollbar_offset * zoom - p_center; scroll_offset = zoom_anchor * zoom - p_center;
h_scrollbar->set_value(offset.x);
v_scrollbar->set_value(offset.y);
} }
_update_zoom_label(); _update_zoom_label();
@@ -3193,8 +3212,8 @@ GraphEdit::GraphEdit() {
v_scrollbar->set_min(-10000); v_scrollbar->set_min(-10000);
v_scrollbar->set_max(10000); v_scrollbar->set_max(10000);
h_scrollbar->connect(SceneStringName(value_changed), callable_mp(this, &GraphEdit::_scroll_moved)); h_scrollbar->connect(SceneStringName(value_changed), callable_mp(this, &GraphEdit::_scrollbar_moved));
v_scrollbar->connect(SceneStringName(value_changed), callable_mp(this, &GraphEdit::_scroll_moved)); v_scrollbar->connect(SceneStringName(value_changed), callable_mp(this, &GraphEdit::_scrollbar_moved));
// Toolbar menu. // Toolbar menu.

8
scene/gui/graph_edit.h
View File

@@ -228,6 +228,10 @@ private:
float zoom_min = 0.0; float zoom_min = 0.0;
float zoom_max = 0.0; float zoom_max = 0.0;
Vector2 min_scroll_offset;
Vector2 max_scroll_offset;
Vector2 scroll_offset;
bool box_selecting = false; bool box_selecting = false;
bool box_selection_mode_additive = false; bool box_selection_mode_additive = false;
Point2 box_selecting_from; Point2 box_selecting_from;
@@ -327,9 +331,9 @@ private:
void _ensure_node_order_from_root(const StringName &p_node); void _ensure_node_order_from_root(const StringName &p_node);
void _ensure_node_order_from(Node *p_node); void _ensure_node_order_from(Node *p_node);
void _update_scroll(); void _update_scrollbars();
void _update_scroll_offset(); void _update_scroll_offset();
void _scroll_moved(double); void _scrollbar_moved(double);
virtual void gui_input(const Ref<InputEvent> &p_ev) override; virtual void gui_input(const Ref<InputEvent> &p_ev) override;
void _top_connection_layer_input(const Ref<InputEvent> &p_ev); void _top_connection_layer_input(const Ref<InputEvent> &p_ev);