Skip to content

Commit

Permalink
Merge #32: Add error prevention for mouses with 5+ buttons
Browse files Browse the repository at this point in the history
  • Loading branch information
PunchablePlushie authored Jun 17, 2023
2 parents 8b2192f + 59ccbba commit 6bbbcfa
Show file tree
Hide file tree
Showing 3 changed files with 72 additions and 2 deletions.
1 change: 1 addition & 0 deletions addons/ggs/classes/ggs_input_helper.gd
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,7 @@ func _string_is_for_mouse(btn: String) -> bool:
return keywords["mouse"].has(btn)



### Gamepad

func _get_gp_btn_event_as_text(event: InputEventJoypadButton) -> String:
Expand Down
65 changes: 65 additions & 0 deletions export_presets.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
[preset.0]

name="Windows Desktop"
platform="Windows Desktop"
runnable=true
dedicated_server=false
custom_features=""
export_filter="all_resources"
include_filter=""
exclude_filter=""
export_path=""
encryption_include_filters=""
encryption_exclude_filters=""
encrypt_pck=false
encrypt_directory=false
script_encryption_key=""

[preset.0.options]

custom_template/debug=""
custom_template/release=""
debug/export_console_script=1
binary_format/embed_pck=false
texture_format/bptc=true
texture_format/s3tc=true
texture_format/etc=false
texture_format/etc2=false
binary_format/architecture="x86_64"
codesign/enable=false
codesign/identity_type=0
codesign/identity=""
codesign/password=""
codesign/timestamp=true
codesign/timestamp_server_url=""
codesign/digest_algorithm=1
codesign/description=""
codesign/custom_options=PackedStringArray()
application/modify_resources=true
application/icon=""
application/console_wrapper_icon=""
application/icon_interpolation=4
application/file_version=""
application/product_version=""
application/company_name=""
application/product_name=""
application/file_description=""
application/copyright=""
application/trademarks=""
ssh_remote_deploy/enabled=false
ssh_remote_deploy/host="user@host_ip"
ssh_remote_deploy/port="22"
ssh_remote_deploy/extra_args_ssh=""
ssh_remote_deploy/extra_args_scp=""
ssh_remote_deploy/run_script="Expand-Archive -LiteralPath '{temp_dir}\\{archive_name}' -DestinationPath '{temp_dir}'
$action = New-ScheduledTaskAction -Execute '{temp_dir}\\{exe_name}' -Argument '{cmd_args}'
$trigger = New-ScheduledTaskTrigger -Once -At 00:00
$settings = New-ScheduledTaskSettingsSet
$task = New-ScheduledTask -Action $action -Trigger $trigger -Settings $settings
Register-ScheduledTask godot_remote_debug -InputObject $task -Force:$true
Start-ScheduledTask -TaskName godot_remote_debug
while (Get-ScheduledTask -TaskName godot_remote_debug | ? State -eq running) { Start-Sleep -Milliseconds 100 }
Unregister-ScheduledTask -TaskName godot_remote_debug -Confirm:$false -ErrorAction:SilentlyContinue"
ssh_remote_deploy/cleanup_script="Stop-ScheduledTask -TaskName godot_remote_debug -ErrorAction:SilentlyContinue
Unregister-ScheduledTask -TaskName godot_remote_debug -Confirm:$false -ErrorAction:SilentlyContinue
Remove-Item -Recurse -Force '{temp_dir}'"
Original file line number Diff line number Diff line change
Expand Up @@ -96,22 +96,26 @@ func _event_is_valid(event: InputEvent) -> bool:
has_modifier = (event.shift_pressed or event.alt_pressed or event.ctrl_pressed)

var is_double_click: bool = false
var mouse_button_is_valid: bool = true
if event is InputEventMouseButton:
is_double_click = event.double_click
mouse_button_is_valid = (event.button_index >= 0 and event.button_index <= 9)

var is_valid: bool
if accept_modifiers:
is_valid = (
type_is_valid and
event.is_pressed() and
not event.is_echo() and
not is_double_click)
not is_double_click and
mouse_button_is_valid)
else:
is_valid = (
type_is_valid and
event.is_pressed() and
not event.is_echo() and
not is_double_click and
not is_double_click and
mouse_button_is_valid and
not has_modifier)

return is_valid
Expand Down

0 comments on commit 6bbbcfa

Please sign in to comment.