mirror of
https://github.com/Orama-Interactive/Pixelorama.git
synced 2025-01-18 17:19:50 +00:00
91bfef16b3
* Initial conversion * Hide some dialogs * Update addons * Fix errors in scripts Temporarily commented out adding new file import types and certain Control methods that are not available in the Window class, such as get_global_mouse_position() * Update shaders * Fix some more errors and signals, rename "pressed" to "button_pressed" * Even more error fixes and renaming corrections * Fixed more errors, Pixelorama almost runs * Update ValueSlider.gd * Remove lock() and unlock(), more ImageTexture.create_from_image() static usage * More static function using * Re-add some of the dialog signals, fix window transparency * Change instances of popup_hide to visibility_changed * More more errors and warnings * Fix more errors and warnings * Get rid of errors in the output when opening Pixelorama in Godot * Properly connect most signals without using strings * Fix some scenes * Don't load Main.tscn * Emit signals directly instead of using strings * Fix Keychain menu nodes * Get rid of self. on most instances, as setters and getters are now always called * Some more static typing * Disable texture filters * Fix zooming * Fix int as enum warnings * Fix tools and rename doubleclick to double_click * Update tool scenes * Fix tabs * Fix create new image * Use static typing on flood fill to speed it up * Update static-checks.yml * Reverts #729 for a speedup, hopefully the bug won't get re-introduced * Fix TransparentChecker warning * Re-add Default template * Fix 3D cels * Fix rotation Project converted bug. Should be fixed by https://github.com/godotengine/godot/pull/79264 * Fix UITransparency alignment issue, thanks Variable * Add missing OptionButton items Hopefully that should be all of them * Fix the appearance of CollapsibleContainer * Change instances of world to world_3d * Fix tool button backgrounds * Fix Splash dialog * Fix brush selection * Update Main.gd * Fix About Dialog * Fix more zooming issues * Fix canvas preview zooming * Use signals for queue_redraw on project change * Fix layer button's look * Fix gradients * Some gradient fixes and code cleanups, dithering is still broken * Fix bucket * Fix the rest of the undo_redo.add_(un)do_method() cases * Fix guides * Fix guide text * Some small changes in Main * Update Tools.gd * Fix palette importing * Get rid of TODOGODOT4s * Fix the rest of the dialogs * Update the rest of the scenes * Fix onion skinning and frame tag dialogs * Fix file brushes being imported twice * Fix palette swatch crashing on double click * Use nearest filter for some of the windows * Remove old .tres font files * Fix language switching * Get rid of Keychain.action_get_first_key() on the extra shortcuts of tools * Get rid of Keychain.MenuInputActions and directly set shortcuts to the menu items This temporarily removes echoing support for undo and redo, this will be re-added once https://github.com/godotengine/godot/pull/36493 or https://github.com/godotengine/godot/pull/64317 is merged. * Clean shortcut-related duplicate code in TopMenuContainer * Remove DroidSansFallback now that system fonts can be used as fallback * Remove 3.x settings from project.godot * Format * Format gdgifexporter * Reset Keychain to its original state * Remove textures from the dark and gray themes * Remove all textures from the dark theme * Better static typing in DrawingAlgos * Use Vector2i for project size * [Risky commit] Use Vector2i instead of Vector2 for tools I tested it and everything seems to be working the same as before, but more testing would be appreciated. * Format after previous commit * Fix line angle constraint being rotated 180 degrees This is not a regression from the previous commit(s), Godot 4 probably reversed the logic of `angle_to_point()`. * Fix input map action not found errors when pressing Shift or Control * Make AnimatePanel bigger, add spring interpolation * Fix some layouts/extensions/preferences loading errors * Fix dithering * Update layout resources Probably doesn't change anything at all, but I suppose it might be a good thing to do * Small changes * Disable filter in ResizeCanvas dialog * Fix some preferences default button states * Fix tile mode always having masking on * Use integers in tile mode * Fix checkboxes in preferences not working * More statically typed arrays! No need to have these # Array of X comments anymore! * Fix "apply all" for multiple preview dialogs * Update theme.tres * Add HeaderSmall theme type variation * Fix dynamics buttons * Don't allow sub-zero zoom values * Let zoom_out_max always remain Vector2(0.01, 0.01) This fixes zooming on large canvases * Bump version to v1.0-dev * Fix ambient light not working on 3D cels * Fix .obj loading * Don't allow greater than max values in the zoom slider * Set maximum zoom value to always be (500, 500) * Set zoom slider minimum value to 1 * Some UI changes, mostly related to buttons and the timeline * Change window titles to what they were before * [COMPATIBILITY BROKEN WITH v0.x] Fix loading 3D cels * Avoid changing Cel3DObject's file_path if it's the same * Make preferences window bigger * Fix png exporting * Fix reference image initial size and filter setting * Fix perspective line reverse scaling on zoom and facing 180 degrees away from cursor * Format and some linting * Remove most Images from the rest of the themes * Remove all textures from all themes * Fix drawing when the mouse gets released outside the canvas boundaries * Format Keychain * Implement #890 * Fix recorder * Fix layout deletion * Better static typing and fix empty_clicked signal-connected methods not having arguments * Fix layout and extension directory creation if they don't already exist * Change all instances of "HTML5" to "Web" OS.get_name() now returns "Web" instead of "HTML5" in Godot 4 * Fix JavaScript detection Opening files in the Web version does not yet work for some reason * Fix formatting * Fix lint errors * Remove unneeded lines from rotation shaders * Clean some rotation shader related code * Remove ErrorManager from #891, as it's no longer needed in Godot 4 * Some docstrings * More Vector2i and Recti replacing their float counterparts * Remove the hardcoded shortcut from ValueSlider Note that the brush size shortcut may not change properly because Keychain isn't updated to support Godot 4's input map properly yet. * Fix bugs from the rebase, integer zooming is currently broken * Format * Fix bug where some imported images would fail to load when using smart slice * Fix integer zooming (I think) * Fix errors after #898 * Fix some UI issues with PreviewDialog * Use ctrl/command instead of just ctrl in the shortcuts of the InputMap - gets rid of the need for _use_osx_shortcuts() in Main.gd * Update Keychain and addons/README.md * Update CI to Godot 4.1.1 (probably will not work) * Remove XDGDataPaths.gd * Make windows non-exclusive * Attempt to fix macOS CI * Attempt to fix CI * Attempt to fix CI * Minor fix in the dark theme, more will follow * Silence enumerator/integer warning * Attempt to fix macOS CI * Another attempt to fix macOS CI * Attempt to fix Windows & macOS CI * fix: Recorder directory create (#903) * Update Keychain so that the brush size shortcuts can be changed This update generally lets users use modifier buttons (control, alt, shift, meta) with mouse buttons * Change OSX to macOS * Detect if multi-threading is enabled when exporting gifs * Fix color picker not working on the top color mode * Make some public methods private in Export.gd * Remove Global.window_title variable * Fix frame UI in the timeline breaking after 100 frames * Static typing improvements for the timeline * Better static typing for grids * Fix typo * Fix pixel grid not appearing * Move preference updating code to Global using setters This should make the code a bit more readable, as the logic for each property update can be found directly under the variable declaration, and not hidden in PreferencesDialog's preference_update() method. This also allows for changing these properties outside the preferences, if that will ever be needed. In theory it's also faster as we don't have to do all these string comparisons anymore, but I doubt this will be noticeable in practice. * Remove RestoreDefaultButton.tscn * Implement changing font size in the preferences * Resize HeaderSmall font size along with the default font size * A step towards fixing image loading in the Web version Doesn't completely fix the issue, it requires a fix from Godot's side as well * Implement missing input event actions for buttons TODO: Add default shortcuts * Do not change language and theme if they are already the defaults Reduces the initial loading time a bit * Remove update_hint_tooltips() as it's no longer needed, only keep it for tools This was needed in order for hint tooltips to be successfully translated while taking the shortcuts into account. Godot 4 already it correctly for us now. Tools still need it because they contain multiple shortcut data in their tooltips. * Change ExportDialog's PathDialog's file mode to be "open directory" and make them bigger * Fix Vector2i + Vector2 errors in grid center snapping * Update tooltips when the shortcut profile changes * Fix copy-paste mistake * Update tooltips during startup if the shortcut profile is not the default * Fix gif warning label size in ExportDialog * Fix BBCode in ExportDialog * Fix some Godot 4.2 warnings * Some CI fixes * Static typing improvements and more inline functions * Format * Even more static typing, inline methods, docstrings etc * Some more static typing improvements and inline setters * Remove unneeded project type specifying * Fix splash dialog error * Fix enumerator warning * Don't preload the font in the rules and guides * Fix some integer division warnings Sometimes we indeed need them to be floats * Change some Rect2s to Rect2is * Minor static typing improvements * Update README, CHANGELOG, Translations * Only load translation files when needed, reduces loading time a bit * Update Keychain so it doesn't load languages during startup * Lazy load all tool scenes, breaks compatibility with the extension API Decreases initial loading time * Format * Very minor loading time speedups * Remove unneeded project type specifying * Even more static typing and docstring improvements * Fix extension loading * Palette docstrings --------- Co-authored-by: ppphp <kevinniub@gmail.com>
253 lines
8.9 KiB
GDScript
253 lines
8.9 KiB
GDScript
extends ConfirmationDialog
|
|
|
|
enum InputTypes { KEYBOARD, MOUSE, JOY_BUTTON, JOY_AXIS }
|
|
|
|
@export var input_type := InputTypes.KEYBOARD
|
|
var listened_input: InputEvent
|
|
|
|
@onready var root := get_parent()
|
|
@onready var input_type_l := $VBoxContainer/InputTypeLabel as Label
|
|
@onready var entered_shortcut := $VBoxContainer/EnteredShortcut as LineEdit
|
|
@onready var option_button := $VBoxContainer/OptionButton as OptionButton
|
|
@onready var modifier_buttons := $VBoxContainer/ModifierButtons as HBoxContainer
|
|
@onready var alt_button := $VBoxContainer/ModifierButtons/Alt as CheckBox
|
|
@onready var shift_button := $VBoxContainer/ModifierButtons/Shift as CheckBox
|
|
@onready var control_button := $VBoxContainer/ModifierButtons/Control as CheckBox
|
|
@onready var meta_button := $VBoxContainer/ModifierButtons/Meta as CheckBox
|
|
@onready var command_control_button := $VBoxContainer/ModifierButtons/CommandOrControl as CheckBox
|
|
@onready var already_exists := $VBoxContainer/AlreadyExistsLabel as Label
|
|
|
|
|
|
func _ready() -> void:
|
|
set_process_input(false)
|
|
if input_type == InputTypes.KEYBOARD:
|
|
entered_shortcut.visible = true
|
|
option_button.visible = false
|
|
get_ok_button().focus_neighbor_top = entered_shortcut.get_path()
|
|
get_cancel_button().focus_neighbor_top = entered_shortcut.get_path()
|
|
entered_shortcut.focus_neighbor_bottom = get_ok_button().get_path()
|
|
else:
|
|
if input_type != InputTypes.MOUSE:
|
|
modifier_buttons.visible = false
|
|
get_ok_button().focus_neighbor_top = option_button.get_path()
|
|
get_cancel_button().focus_neighbor_top = option_button.get_path()
|
|
option_button.focus_neighbor_bottom = get_ok_button().get_path()
|
|
|
|
|
|
# get_close_button().focus_mode = Control.FOCUS_NONE
|
|
|
|
|
|
func _input(event: InputEvent) -> void:
|
|
if not event is InputEventKey:
|
|
return
|
|
if event.pressed:
|
|
listened_input = event
|
|
_set_modifier_buttons_state(listened_input)
|
|
entered_shortcut.text = event.as_text()
|
|
_show_assigned_state(event)
|
|
|
|
|
|
func _show_assigned_state(event: InputEvent) -> void:
|
|
var metadata = root.currently_editing_tree_item.get_metadata(0)
|
|
var action := ""
|
|
if metadata is InputEvent: # Editing an input event
|
|
action = root.currently_editing_tree_item.get_parent().get_metadata(0)
|
|
elif metadata is StringName: # Adding a new input event to an action
|
|
action = metadata
|
|
|
|
var matching_pair: Array = _find_matching_event_in_map(action, event)
|
|
if matching_pair:
|
|
already_exists.text = tr("Already assigned to: %s") % root.get_action_name(matching_pair[0])
|
|
else:
|
|
already_exists.text = ""
|
|
|
|
|
|
func _on_ShortcutSelectorDialog_confirmed() -> void:
|
|
if listened_input == null:
|
|
return
|
|
_apply_shortcut_change(listened_input)
|
|
|
|
|
|
func _apply_shortcut_change(input_event: InputEvent) -> void:
|
|
var metadata = root.currently_editing_tree_item.get_metadata(0)
|
|
if metadata is InputEvent: # Editing an input event
|
|
var parent_metadata = root.currently_editing_tree_item.get_parent().get_metadata(0)
|
|
var changed: bool = _set_shortcut(parent_metadata, metadata, input_event)
|
|
if !changed:
|
|
return
|
|
root.currently_editing_tree_item.set_metadata(0, input_event)
|
|
root.currently_editing_tree_item.set_text(0, root.event_to_str(input_event))
|
|
elif metadata is StringName: # Adding a new input event to an action
|
|
var changed: bool = _set_shortcut(metadata, null, input_event)
|
|
if !changed:
|
|
return
|
|
root.add_event_tree_item(input_event, root.currently_editing_tree_item)
|
|
|
|
|
|
func _set_shortcut(action: StringName, old_event: InputEvent, new_event: InputEvent) -> bool:
|
|
if InputMap.action_has_event(action, new_event): # If the current action already has that event
|
|
return false
|
|
if old_event:
|
|
Keychain.action_erase_event(action, old_event)
|
|
|
|
# Loop through other actions to see if the event exists there, to re-assign it
|
|
var matching_pair := _find_matching_event_in_map(action, new_event)
|
|
|
|
if matching_pair:
|
|
var group := ""
|
|
if action in Keychain.actions:
|
|
group = Keychain.actions[action].group
|
|
|
|
var action_to_replace: StringName = matching_pair[0]
|
|
var input_to_replace: InputEvent = matching_pair[1]
|
|
Keychain.action_erase_event(action_to_replace, input_to_replace)
|
|
Keychain.selected_profile.change_action(action_to_replace)
|
|
var tree_item: TreeItem = root.tree.get_root()
|
|
var prev_tree_item: TreeItem
|
|
while tree_item != null: # Loop through Tree's TreeItems...
|
|
var metadata = tree_item.get_metadata(0)
|
|
if metadata is InputEvent:
|
|
if input_to_replace.is_match(metadata):
|
|
var map_action: StringName = tree_item.get_parent().get_metadata(0)
|
|
if map_action == action_to_replace:
|
|
tree_item.free()
|
|
break
|
|
|
|
tree_item = tree_item.get_next_in_tree()
|
|
|
|
Keychain.action_add_event(action, new_event)
|
|
Keychain.selected_profile.change_action(action)
|
|
return true
|
|
|
|
|
|
func _find_matching_event_in_map(action: StringName, event: InputEvent) -> Array:
|
|
var group := ""
|
|
if action in Keychain.actions:
|
|
group = Keychain.actions[action].group
|
|
|
|
for map_action in InputMap.get_actions():
|
|
if map_action in Keychain.ignore_actions:
|
|
continue
|
|
if Keychain.ignore_ui_actions and (map_action as String).begins_with("ui_"):
|
|
continue
|
|
for map_event in InputMap.action_get_events(map_action):
|
|
if !event.is_match(map_event):
|
|
continue
|
|
|
|
if map_action in Keychain.actions:
|
|
# If it's local, check if it's the same group, otherwise ignore
|
|
if !Keychain.actions[action].global or !Keychain.actions[map_action].global:
|
|
if Keychain.actions[map_action].group != group:
|
|
continue
|
|
|
|
return [map_action, map_event]
|
|
|
|
return []
|
|
|
|
|
|
func _on_ShortcutSelectorDialog_about_to_show() -> void:
|
|
var metadata = root.currently_editing_tree_item.get_metadata(0)
|
|
if input_type == InputTypes.KEYBOARD:
|
|
listened_input = null
|
|
already_exists.text = ""
|
|
entered_shortcut.text = ""
|
|
if metadata is InputEvent:
|
|
_set_modifier_buttons_state(metadata)
|
|
await get_tree().process_frame
|
|
entered_shortcut.grab_focus()
|
|
else:
|
|
if metadata is InputEvent: # Editing an input event
|
|
var index := 0
|
|
if metadata is InputEventMouseButton:
|
|
index = metadata.button_index - 1
|
|
_set_modifier_buttons_state(metadata)
|
|
elif metadata is InputEventJoypadButton:
|
|
index = metadata.button_index
|
|
elif metadata is InputEventJoypadMotion:
|
|
index = metadata.axis * 2
|
|
index += signi(metadata.axis_value) / 2.0 + 0.5
|
|
option_button.select(index)
|
|
_on_OptionButton_item_selected(index)
|
|
|
|
elif metadata is StringName: # Adding a new input event to an action
|
|
option_button.select(0)
|
|
_on_OptionButton_item_selected(0)
|
|
|
|
|
|
func _on_ShortcutSelectorDialog_popup_hide() -> void:
|
|
set_process_input(false)
|
|
|
|
|
|
func _on_OptionButton_item_selected(index: int) -> void:
|
|
if input_type == InputTypes.MOUSE:
|
|
listened_input = InputEventMouseButton.new()
|
|
listened_input.button_index = index + 1
|
|
listened_input.alt_pressed = alt_button.button_pressed
|
|
listened_input.shift_pressed = shift_button.button_pressed
|
|
listened_input.ctrl_pressed = control_button.button_pressed
|
|
listened_input.meta_pressed = meta_button.button_pressed
|
|
listened_input.command_or_control_autoremap = command_control_button.button_pressed
|
|
elif input_type == InputTypes.JOY_BUTTON:
|
|
listened_input = InputEventJoypadButton.new()
|
|
listened_input.button_index = index
|
|
elif input_type == InputTypes.JOY_AXIS:
|
|
listened_input = InputEventJoypadMotion.new()
|
|
listened_input.axis = index / 2
|
|
listened_input.axis_value = -1.0 if index % 2 == 0 else 1.0
|
|
_show_assigned_state(listened_input)
|
|
|
|
|
|
func _on_EnteredShortcut_focus_entered() -> void:
|
|
set_process_input(true)
|
|
|
|
|
|
func _on_EnteredShortcut_focus_exited() -> void:
|
|
set_process_input(false)
|
|
|
|
|
|
func _on_alt_toggled(button_pressed: bool) -> void:
|
|
if not is_instance_valid(listened_input):
|
|
return
|
|
listened_input.alt_pressed = button_pressed
|
|
entered_shortcut.text = listened_input.as_text()
|
|
|
|
|
|
func _set_modifier_buttons_state(event: InputEventWithModifiers) -> void:
|
|
alt_button.button_pressed = event.alt_pressed
|
|
shift_button.button_pressed = event.shift_pressed
|
|
control_button.button_pressed = event.ctrl_pressed
|
|
meta_button.button_pressed = event.meta_pressed
|
|
command_control_button.button_pressed = event.command_or_control_autoremap
|
|
|
|
|
|
func _on_shift_toggled(button_pressed: bool) -> void:
|
|
if not is_instance_valid(listened_input):
|
|
return
|
|
listened_input.shift_pressed = button_pressed
|
|
entered_shortcut.text = listened_input.as_text()
|
|
|
|
|
|
func _on_control_toggled(button_pressed: bool) -> void:
|
|
if not is_instance_valid(listened_input):
|
|
return
|
|
listened_input.ctrl_pressed = button_pressed
|
|
entered_shortcut.text = listened_input.as_text()
|
|
|
|
|
|
func _on_meta_toggled(button_pressed: bool) -> void:
|
|
if not is_instance_valid(listened_input):
|
|
return
|
|
listened_input.meta_pressed = button_pressed
|
|
entered_shortcut.text = listened_input.as_text()
|
|
|
|
|
|
func _on_command_or_control_toggled(button_pressed: bool) -> void:
|
|
control_button.button_pressed = false
|
|
meta_button.button_pressed = false
|
|
control_button.visible = not button_pressed
|
|
meta_button.visible = not button_pressed
|
|
if not is_instance_valid(listened_input):
|
|
return
|
|
listened_input.command_or_control_autoremap = button_pressed
|
|
entered_shortcut.text = listened_input.as_text()
|