Added shortcuts for quick buttons bar in add node popup

Author: williamchange

material_maker/doc/user_interface_graph_panel.rst

@@ -69,6 +69,9 @@ button. This menu has a filter field to quickly find the desired node.
 The buttons at the top of the node menu can be used to quickly create the most common
 nodes. They can be customized by dragging the nodes from the list below into the buttons.
 
+Number row keys(i.e. 1, 2...0) can also be used to activate the corresponding buttons
+without opening the node menu.
+
 .. image:: images/node_menu.png
   :align: center
 

material_maker/doc/user_interface_shortcuts.rst

@@ -124,6 +124,9 @@ Graph Editor
 +-------------------------------------------------------+----------------------------------------------------+
 | :kbd:`Ctrl/Cmd-Shift-Z`                               | Redo                                               |
 +-------------------------------------------------------+----------------------------------------------------+
+| :kbd:`1` :kbd:`2` :kbd:`3` :kbd:`4` :kbd:`5`          | Add node from respective quick bar slot in add     |
+| :kbd:`6` :kbd:`7` :kbd:`8` :kbd:`9` :kbd:`0`          | node popup/menu                                    |       
++-------------------------------------------------------+----------------------------------------------------+
 
 Nodes
 +++++

material_maker/panels/graph_edit/graph_edit.gd

@@ -135,7 +135,7 @@ func process_port_click(pressed : bool):
 						return
 
 
-func _input(event: InputEvent) -> void:
+func _input(event : InputEvent) -> void:
 	# Handle node grab
 	if has_grab:
 		var selected_nodes := get_selected_nodes()
@@ -156,6 +156,11 @@ func _input(event: InputEvent) -> void:
 					if get_nodes_under_mouse().is_empty():
 						node.set_deferred("selected", true)
 
+	# 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:
+			grab_focus()
 
 func _gui_input(event) -> void:
 	if (
@@ -299,6 +304,9 @@ func _gui_input(event) -> void:
 						has_grab = true
 				KEY_ESCAPE:
 					has_grab = false
+				_ when event.unicode >= KEY_0 and event.unicode <= KEY_9:
+					if get_nodes_under_mouse().is_empty():
+						quick_bar_shortcuts(event)
 		match event.get_keycode():
 			KEY_SHIFT, KEY_CTRL, KEY_ALT:
 				var found_tip : bool = false
@@ -1833,6 +1841,22 @@ func _get_connection_line(from : Vector2, to : Vector2) -> PackedVector2Array:
 		_:
 			return points
 
+func quick_bar_shortcuts(event : InputEventKey) -> void:
+	if not Rect2(Vector2.ZERO, size).has_point(get_local_mouse_position()):
+		return
+	var key_num : int = event.unicode - KEY_0 - 1
+	key_num = 9 if key_num == -1 else key_num
+
+	var library_manager : Node = get_node("/root/MainWindow/NodeLibraryManager")
+	var quick_button_key : String = "quick_button_%d" % [key_num]
+
+	if mm_globals.config.has_section_key("library", quick_button_key):
+		var config : String = mm_globals.config.get_value("library", quick_button_key)
+		if config != "":
+			var library_item : Dictionary = library_manager.get_item(config)
+			if library_item != null:
+				do_paste(library_item.item)
+
 func colorize_nodes() -> void:
 	var nodes : Array[GraphElement]
 	for n in get_children():

material_maker/windows/add_node_popup/quick_button.gd

@@ -32,20 +32,19 @@ func set_library_item(li : String):
 		material.set_shader_parameter("tex", ImageTexture.create_from_image(
 				get_theme_icon("radio_unchecked", "PopupMenu").get_image()))
 		tooltip_text = "Drag a node from the list to this slot to add it to the quick access."
+		tooltip_text += "\nSlots can be triggered using number row keys(i.e. 1, 2, 3..0)"
+	mm_globals.config.set_value("library", "quick_button_%d" % get_index(), li)
 
 func _drop_data(_position, data):
 	set_library_item(data)
 	enable()
-	mm_globals.config.set_value("library", "quick_button_%d" % get_index(), data)
-
 
 func _on_gui_input(event):
 	if !disabled and event is InputEventMouseButton:
 		if event.pressed and event.button_index == MOUSE_BUTTON_LEFT:
 			emit_signal("object_selected", library_item.item)
 		if event.pressed and event.button_index == MOUSE_BUTTON_RIGHT:
 			set_library_item("")
-			mm_globals.config.set_value("library", "quick_button_%d" % get_index(), "")
 			disable()
 
 func enable() -> void: