Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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: 6 additions & 1 deletion project.godot
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ config_version=5
config/name="SoundThread"
config/description="Node based interface for the Composers Desktop Project"
run/main_scene="uid://bcs87y7ptx3ke"
config/features=PackedStringArray("4.4", "Forward Plus")
config/features=PackedStringArray("4.5", "Forward Plus")
run/max_fps=30
run/low_processor_mode=true
boot_splash/bg_color=Color(0.160784, 0.25098, 0.247059, 1)
Expand Down Expand Up @@ -93,6 +93,11 @@ redo={
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"command_or_control_autoremap":true,"alt_pressed":false,"shift_pressed":false,"pressed":false,"keycode":0,"physical_keycode":89,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null)
]
}
quit={
"deadzone": 0.2,
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"command_or_control_autoremap":true,"alt_pressed":false,"shift_pressed":false,"pressed":false,"keycode":0,"physical_keycode":81,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null)
]
}

[rendering]

Expand Down
8 changes: 8 additions & 0 deletions scenes/main/scripts/audiosettings.gd
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,14 @@ func _on_about_to_popup() -> void:

func _on_close_requested() -> void:
device_timer.stop()
hide()


func _input(event: InputEvent) -> void:
if visible and event is InputEventKey and event.pressed and event.keycode == KEY_ESCAPE:
device_timer.stop()
hide()
get_viewport().set_input_as_handled()


func update_device_list():
Expand Down
4 changes: 4 additions & 0 deletions scenes/main/scripts/control.gd
Original file line number Diff line number Diff line change
Expand Up @@ -340,6 +340,10 @@ func _input(event):
elif event.is_action_pressed("save_as"):
savestate = "saveas"
$SaveDialog.popup_centered()

elif event.is_action_pressed("quit"):
# same logic que le Window cliose button
get_tree().root.propagate_notification(NOTIFICATION_WM_CLOSE_REQUEST)

func simulate_mouse_click():
#simulates clicking the middle mouse button in order to hide any visible tooltips
Expand Down
6 changes: 6 additions & 0 deletions scenes/main/scripts/settings.gd
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,12 @@ func _ready() -> void:
pass


func _input(event: InputEvent) -> void:
if visible and event is InputEventKey and event.pressed and event.keycode == KEY_ESCAPE:
hide()
get_viewport().set_input_as_handled()


func _on_change_cdp_button_down() -> void:
self.hide()
open_cdp_location.emit()
Expand Down
6 changes: 5 additions & 1 deletion scenes/main/shortcuts.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
"Run Thread": "Ctrl + R",
"New Thread": "Ctrl + N",
"Save Thread": "Ctrl + S",
"Save Thread As": "Ctrl + Shift + S"
"Save Thread As": "Ctrl + Shift + S",
"Quit": "Ctrl + Q"
},
"Building a Thread":{
"Add Node (Open Search)": "Right click empty space or Ctrl + F",
Expand All @@ -21,5 +22,8 @@
"Navigating a Thread":{
"Zoom": "Mouse wheel",
"Move": "Middle click + drag or Ctrl + Mouse wheel"
},
"Dialogs":{
"Close Settings/Audio Settings": "Escape"
}
}