Skip to content

Fix quick bar shortcuts conflicting with text input in graph #1433

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
williamchange wants to merge 1 commit into
base: master
Choose a base branch
from
+5 −2
Open

Fix quick bar shortcuts conflicting with text input in graph #1433

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions material_maker/panels/graph_edit/graph_edit.gd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,8 +160,11 @@ func _input(event : InputEvent) -> void:

# Grab graph focus for quick bar shortcuts to work properly
# (i.e. returning to graph after interacting with other panels)
if Rect2(Vector2.ZERO, size).has_point(get_local_mouse_position()):
if event is InputEventKey and event.unicode >= KEY_0 and event.unicode <= KEY_9 and event.pressed:
if Rect2(Vector2.ZERO, size).has_point(get_local_mouse_position()) and event is InputEventKey:
var focus_owner : Control = get_viewport().gui_get_focus_owner()
if focus_owner is LineEdit or focus_owner is TextEdit:
return
if event.unicode >= KEY_0 and event.unicode <= KEY_9 and event.pressed:
grab_focus()

func _gui_input(event) -> void:
Expand Down