From 1b71dd565a69e7d9f8c7d51358baffb1ef0d3aaa Mon Sep 17 00:00:00 2001
From: Emmanouil Papadeas <35376950+OverloadedOrama@users.noreply.github.com>
Date: Mon, 10 Feb 2025 03:04:42 +0200
Subject: [PATCH] Various small code improvements

---
 addons/dockable_container/layout_panel.gd | 2 +-
 src/Autoload/Tools.gd                     | 2 +-
 src/UI/Timeline/AnimationTimeline.tscn    | 1 +
 src/UI/Timeline/CelButton.gd              | 5 ++---
 src/UI/ToolsPanel/ToolButtons.gd          | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/dockable_container/layout_panel.gd b/addons/dockable_container/layout_panel.gd
index e15201b10..1a58c5597 100644
--- a/addons/dockable_container/layout_panel.gd
+++ b/addons/dockable_container/layout_panel.gd
@@ -11,7 +11,7 @@ extends DockableLayoutNode
 		emit_tree_changed()
 @export var current_tab: int:
 	get:
-		return int(clamp(_current_tab, 0, _names.size() - 1))
+		return clampi(_current_tab, 0, _names.size() - 1)
 	set(value):
 		if value != _current_tab:
 			_current_tab = value
diff --git a/src/Autoload/Tools.gd b/src/Autoload/Tools.gd
index 7ef86bc87..b57fe9d1c 100644
--- a/src/Autoload/Tools.gd
+++ b/src/Autoload/Tools.gd
@@ -444,7 +444,7 @@ func add_tool_button(t: Tool, insert_pos := -1) -> void:
 	if insert_pos > -1:
 		insert_pos = mini(insert_pos, _tool_buttons.get_child_count() - 1)
 		_tool_buttons.move_child(tool_button, insert_pos)
-	tool_button.pressed.connect(_tool_buttons._on_Tool_pressed.bind(tool_button))
+	tool_button.pressed.connect(_tool_buttons._on_tool_pressed.bind(tool_button))
 
 
 func remove_tool(t: Tool) -> void:
diff --git a/src/UI/Timeline/AnimationTimeline.tscn b/src/UI/Timeline/AnimationTimeline.tscn
index 6cc7eb072..77268445d 100644
--- a/src/UI/Timeline/AnimationTimeline.tscn
+++ b/src/UI/Timeline/AnimationTimeline.tscn
@@ -1028,6 +1028,7 @@ unique_name_in_owner = true
 layout_mode = 2
 size_flags_horizontal = 3
 focus_mode = 2
+mouse_default_cursor_shape = 2
 theme_type_variation = &"ValueSlider"
 nine_patch_stretch = true
 stretch_margin_left = 3
diff --git a/src/UI/Timeline/CelButton.gd b/src/UI/Timeline/CelButton.gd
index ee1141b3e..d145292a9 100644
--- a/src/UI/Timeline/CelButton.gd
+++ b/src/UI/Timeline/CelButton.gd
@@ -87,10 +87,9 @@ func _on_CelButton_pressed() -> void:
 	if Input.is_action_just_released("left_mouse"):
 		Global.canvas.selection.transform_content_confirm()
 		var change_cel := true
-		var prev_curr_frame: int = project.current_frame
-		var prev_curr_layer: int = project.current_layer
-
 		if Input.is_action_pressed("shift"):
+			var prev_curr_frame := project.current_frame
+			var prev_curr_layer := project.current_layer
 			var frame_diff_sign := signi(frame - prev_curr_frame)
 			if frame_diff_sign == 0:
 				frame_diff_sign = 1
diff --git a/src/UI/ToolsPanel/ToolButtons.gd b/src/UI/ToolsPanel/ToolButtons.gd
index f491b8c78..541f52586 100644
--- a/src/UI/ToolsPanel/ToolButtons.gd
+++ b/src/UI/ToolsPanel/ToolButtons.gd
@@ -38,7 +38,7 @@ func _unhandled_input(event: InputEvent) -> void:
 				return
 
 
-func _on_Tool_pressed(tool_pressed: BaseButton) -> void:
+func _on_tool_pressed(tool_pressed: BaseButton) -> void:
 	var button := -1
 	button = MOUSE_BUTTON_LEFT if Input.is_action_just_released("left_mouse") else button
 	button = (