diff --git a/src/Autoload/Global.gd b/src/Autoload/Global.gd index 750ad23ff..b2e49786e 100644 --- a/src/Autoload/Global.gd +++ b/src/Autoload/Global.gd @@ -241,6 +241,7 @@ func _ready() -> void: # XDGDataDirs depends on it nyaa directory_module = XDGDataPaths.new() image_clipboard = Image.new() + Input.set_custom_mouse_cursor(Global.cursor_image, Input.CURSOR_CROSS, Vector2(15, 15)) var root = get_tree().get_root() control = find_node_by_name(root, "Control") diff --git a/src/Canvas.gd b/src/Canvas.gd index c62b0a8aa..f9296935b 100644 --- a/src/Canvas.gd +++ b/src/Canvas.gd @@ -162,8 +162,6 @@ func _input(event : InputEvent) -> void: Global.cursor_position_label.text = "[%s×%s] %s, %s" % [current_project.size.x, current_project.size.y, mouse_pos_floored.x, mouse_pos_floored.y] if !cursor_image_has_changed: cursor_image_has_changed = true - if Global.cursor_image.get_data().get_size() != Vector2.ZERO: - Input.set_custom_mouse_cursor(Global.cursor_image, 0, Vector2(15, 15)) if Global.show_left_tool_icon: Global.left_cursor.visible = true if Global.show_right_tool_icon: @@ -174,7 +172,6 @@ func _input(event : InputEvent) -> void: cursor_image_has_changed = false Global.left_cursor.visible = false Global.right_cursor.visible = false - Input.set_custom_mouse_cursor(null) # Handle Undo/Redo var can_handle : bool = Global.can_draw && Global.has_focus && !made_line diff --git a/src/Main.gd b/src/Main.gd index bf56dff81..eb0001d5c 100644 --- a/src/Main.gd +++ b/src/Main.gd @@ -181,7 +181,6 @@ func _on_QuitDialog_confirmed() -> void: func _on_BackupConfirmation_confirmed(project_paths : Array, backup_paths : Array) -> void: OpenSave.reload_backup_file(project_paths, backup_paths) -# Global.tabs.delete_tab(0) OpenSave.autosave_timer.start() $ExportDialog.file_name = OpenSave.current_save_paths[0].get_file().trim_suffix(".pxo") $ExportDialog.directory_path = OpenSave.current_save_paths[0].get_base_dir() diff --git a/src/SelectionRectangle.gd b/src/SelectionRectangle.gd index 367efdf4a..b3acfdd90 100644 --- a/src/SelectionRectangle.gd +++ b/src/SelectionRectangle.gd @@ -67,7 +67,7 @@ func _process(_delta : float) -> void: update() else: - get_parent().get_parent().mouse_default_cursor_shape = Input.CURSOR_ARROW + get_parent().get_parent().mouse_default_cursor_shape = Input.CURSOR_CROSS if is_dragging: if (Global.current_tools[0] == Global.Tools.RECTSELECT && Input.is_action_pressed("left_mouse")) || (Global.current_tools[1] == Global.Tools.RECTSELECT && Input.is_action_pressed("right_mouse")): diff --git a/src/UI/UI.tscn b/src/UI/UI.tscn index e376f260c..d677b2ba3 100644 --- a/src/UI/UI.tscn +++ b/src/UI/UI.tscn @@ -22,7 +22,7 @@ [ext_resource path="res://assets/graphics/dark_themes/tools/zoom.png" type="Texture" id=21] [ext_resource path="res://src/UI/ViewportContainer.gd" type="Script" id=23] -[sub_resource type="StyleBoxFlat" id=2] +[sub_resource type="StyleBoxFlat" id=1] bg_color = Color( 0.0627451, 0.0627451, 0.0627451, 1 ) expand_margin_top = 6.0 @@ -266,6 +266,7 @@ margin_left = 16.0 margin_right = 890.0 margin_bottom = 426.0 focus_mode = 2 +mouse_default_cursor_shape = 3 size_flags_horizontal = 3 size_flags_vertical = 3 stretch = true @@ -320,7 +321,7 @@ script = ExtResource( 7 ) [node name="AnimationTimeline" parent="CanvasAndTimeline" instance=ExtResource( 18 )] margin_top = 492.0 margin_bottom = 692.0 -custom_styles/panel = SubResource( 2 ) +custom_styles/panel = SubResource( 1 ) [node name="RightPanel" type="Panel" parent="."] margin_left = 950.0