Andrew/redot-engine
1
0
Fork 0
mirror of https://github.com/Redot-Engine/redot-engine.git synced 2025-12-05 23:07:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

[GraphNode] Fix slot focus rect draw, make slot focus mode configurable.

Browse Source
This commit is contained in:
Pāvels Nadtočajevs
2025-06-21 22:54:46 +03:00
parent d7bdc0be16
commit 71834ebbdd
3 changed files with 61 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
doc/classes/GraphNode.xml
View File

@@ -272,6 +272,12 @@
If [code]true[/code], you can connect ports with different types, even if the connection was not explicitly allowed in the parent [GraphEdit].
</member>
<member name="mouse_filter" type="int" setter="set_mouse_filter" getter="get_mouse_filter" overrides="Control" enum="Control.MouseFilter" default="0" />
<member name="slots_focus_mode" type="int" setter="set_slots_focus_mode" getter="get_slots_focus_mode" enum="Control.FocusMode" default="3">
Determines how connection slots can be focused.
- If set to [constant Control.FOCUS_CLICK], connections can only be made with the mouse.
- If set to [constant Control.FOCUS_ALL], slots can also be focused using the [member ProjectSettings.input/ui_up] and [member ProjectSettings.input/ui_down] and connected using [member ProjectSettings.input/ui_left] and [member ProjectSettings.input/ui_right] input actions.
- If set to [constant Control.FOCUS_ACCESSIBILITY], slot input actions are only enabled when the screen reader is active.
</member>
<member name="title" type="String" setter="set_title" getter="get_title" default="&quot;&quot;">
The text displayed in the GraphNode's title bar.
</member>

42
scene/gui/graph_node.cpp
View File

@@ -407,6 +407,8 @@ void GraphNode::gui_input(const Ref<InputEvent> &p_event) {
}
if (p_event->is_pressed() && slot_count > 0) {
bool ac_enabled = get_tree() && get_tree()->is_accessibility_enabled();
if ((ac_enabled && slots_focus_mode == Control::FOCUS_ACCESSIBILITY) || slots_focus_mode == Control::FOCUS_ALL) {
if (p_event->is_action("ui_up", true)) {
selected_slot--;
if (selected_slot < 0) {
@@ -421,7 +423,9 @@ void GraphNode::gui_input(const Ref<InputEvent> &p_event) {
} else {
accept_event();
}
} else if (p_event->is_action("ui_cancel", true)) {
}
}
if (p_event->is_action("ui_cancel", true)) {
GraphEdit *graph = Object::cast_to<GraphEdit>(get_parent());
if (graph && graph->is_keyboard_connecting()) {
graph->force_connection_drag_end();
@@ -664,9 +668,18 @@ void GraphNode::_notification(int p_what) {
}
if (slot_index == selected_slot) {
Size2i port_sz = theme_cache.port->get_size();
draw_style_box(sb_slot_selected, Rect2i(port_h_offset - port_sz.x, slot_y_cache[E.key] + sb_panel->get_margin(SIDE_TOP) - port_sz.y, port_sz.x * 2, port_sz.y * 2));
draw_style_box(sb_slot_selected, Rect2i(get_size().x - port_h_offset - port_sz.x, slot_y_cache[E.key] + sb_panel->get_margin(SIDE_TOP) - port_sz.y, port_sz.x * 2, port_sz.y * 2));
Ref<Texture2D> port_icon = slot.custom_port_icon_left;
if (port_icon.is_null()) {
port_icon = theme_cache.port;
}
Size2i port_sz = port_icon->get_size() + sb_slot_selected->get_minimum_size();
draw_style_box(sb_slot_selected, Rect2i(port_h_offset - port_sz.x * 0.5, slot_y_cache[E.key] - port_sz.y * 0.5, port_sz.x, port_sz.y));
port_icon = slot.custom_port_icon_right;
if (port_icon.is_null()) {
port_icon = theme_cache.port;
}
port_sz = port_icon->get_size() + sb_slot_selected->get_minimum_size();
draw_style_box(sb_slot_selected, Rect2i(get_size().x - port_h_offset - port_sz.x * 0.5, slot_y_cache[E.key] - port_sz.y * 0.5, port_sz.x, port_sz.y));
}
// Draw slot stylebox.
@@ -1180,6 +1193,23 @@ Vector<int> GraphNode::get_allowed_size_flags_vertical() const {
return flags;
}
void GraphNode::set_slots_focus_mode(Control::FocusMode p_focus_mode) {
if (slots_focus_mode == p_focus_mode) {
return;
}
ERR_FAIL_COND((int)p_focus_mode < 1 || (int)p_focus_mode > 3);
slots_focus_mode = p_focus_mode;
if (slots_focus_mode == Control::FOCUS_CLICK && selected_slot > -1) {
selected_slot = -1;
queue_redraw();
}
}
Control::FocusMode GraphNode::get_slots_focus_mode() const {
return slots_focus_mode;
}
void GraphNode::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_title", "title"), &GraphNode::set_title);
ClassDB::bind_method(D_METHOD("get_title"), &GraphNode::get_title);
@@ -1220,6 +1250,9 @@ void GraphNode::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_ignore_invalid_connection_type", "ignore"), &GraphNode::set_ignore_invalid_connection_type);
ClassDB::bind_method(D_METHOD("is_ignoring_valid_connection_type"), &GraphNode::is_ignoring_valid_connection_type);
ClassDB::bind_method(D_METHOD("set_slots_focus_mode", "focus_mode"), &GraphNode::set_slots_focus_mode);
ClassDB::bind_method(D_METHOD("get_slots_focus_mode"), &GraphNode::get_slots_focus_mode);
ClassDB::bind_method(D_METHOD("get_input_port_count"), &GraphNode::get_input_port_count);
ClassDB::bind_method(D_METHOD("get_input_port_position", "port_idx"), &GraphNode::get_input_port_position);
ClassDB::bind_method(D_METHOD("get_input_port_type", "port_idx"), &GraphNode::get_input_port_type);
@@ -1236,6 +1269,7 @@ void GraphNode::_bind_methods() {
ADD_PROPERTY(PropertyInfo(Variant::STRING, "title"), "set_title", "get_title");
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "ignore_invalid_connection_type"), "set_ignore_invalid_connection_type", "is_ignoring_valid_connection_type");
ADD_PROPERTY(PropertyInfo(Variant::INT, "slots_focus_mode", PROPERTY_HINT_ENUM, "Click:1,All:2,Accessibility:3"), "set_slots_focus_mode", "get_slots_focus_mode");
ADD_SIGNAL(MethodInfo("slot_updated", PropertyInfo(Variant::INT, "slot_index")));
ADD_SIGNAL(MethodInfo("slot_sizes_changed"));

4
scene/gui/graph_node.h
View File

@@ -85,6 +85,7 @@ class GraphNode : public GraphElement {
HashMap<int, Slot> slot_table;
Vector<int> slot_y_cache;
Control::FocusMode slots_focus_mode = Control::FOCUS_ACCESSIBILITY;
int slot_count = 0;
int selected_slot = -1;
@@ -179,6 +180,9 @@ public:
Color get_output_port_color(int p_port_idx);
int get_output_port_slot(int p_port_idx);
void set_slots_focus_mode(Control::FocusMode p_focus_mode);
Control::FocusMode get_slots_focus_mode() const;
virtual Size2 get_minimum_size() const override;
virtual CursorShape get_cursor_shape(const Point2 &p_pos = Point2i()) const override;