Merge branch 'master' of https://github.com/Orama-Interactive/Pixelorama into xdg-standard

Keeping stuff in sync with upstream nyaa ^.^
This commit is contained in:
sapient_cogbag 2020-04-11 17:12:01 +01:00
commit 480bbffc0b
No known key found for this signature in database
GPG key ID: 9DA0A435732D7C4A
6 changed files with 195 additions and 138 deletions

View file

@ -448,6 +448,8 @@ func _on_Tool_pressed(tool_pressed : BaseButton, mouse_press := true, key_for_le
for i in range(1, Global.left_tool_options_container.get_child_count()):
Global.left_tool_options_container.get_child(i).visible = false
Global.left_tool_options_container.get_node("EmptySpacer").visible = true
# Tool options visible depending on the selected tool
if current_action == "Pencil":
Global.left_brush_type_container.visible = true
@ -480,6 +482,8 @@ func _on_Tool_pressed(tool_pressed : BaseButton, mouse_press := true, key_for_le
for i in range(1, Global.right_tool_options_container.get_child_count()):
Global.right_tool_options_container.get_child(i).visible = false
Global.right_tool_options_container.get_node("EmptySpacer").visible = true
# Tool options visible depending on the selected tool
if current_action == "Pencil":
Global.right_brush_type_container.visible = true