From 15033298642b7ebd6930adebe1892a74f8f6d5ad Mon Sep 17 00:00:00 2001 From: notdraimdev Date: Fri, 4 Oct 2024 15:04:13 +0200 Subject: [PATCH] Smooth interactions --- Main.tscn | 115 +++++++++++++--------- addons/discord-rpc-gd/restart_window.tscn | 4 +- main.gd | 6 +- select_playlist.gd | 23 ++++- settings.gd | 2 +- settings_button.gd | 32 +++--- update_checker.gd | 9 +- 7 files changed, 114 insertions(+), 77 deletions(-) diff --git a/Main.tscn b/Main.tscn index 7c0110b..60d07b6 100644 --- a/Main.tscn +++ b/Main.tscn @@ -92,14 +92,6 @@ keycode = 82 [sub_resource type="Shortcut" id="Shortcut_axi6u"] events = [SubResource("InputEventKey_0jlka")] -[sub_resource type="InputEventKey" id="InputEventKey_117g0"] -device = -1 -ctrl_pressed = true -keycode = 83 - -[sub_resource type="Shortcut" id="Shortcut_8p5o4"] -events = [SubResource("InputEventKey_117g0")] - [sub_resource type="InputEventKey" id="InputEventKey_5af16"] device = -1 keycode = 32 @@ -153,6 +145,14 @@ keycode = 81 [sub_resource type="Shortcut" id="Shortcut_g3fcr"] events = [SubResource("InputEventKey_puhgg")] +[sub_resource type="InputEventKey" id="InputEventKey_117g0"] +device = -1 +ctrl_pressed = true +keycode = 83 + +[sub_resource type="Shortcut" id="Shortcut_8p5o4"] +events = [SubResource("InputEventKey_117g0")] + [sub_resource type="LabelSettings" id="LabelSettings_b1152"] font_size = 31 @@ -285,20 +285,30 @@ shortcut = SubResource("Shortcut_vp2fh") text = "Playlists" script = ExtResource("12_of5fe") -[node name="PlaylistsPanel" type="Control" parent="."] -visible = false +[node name="PlaylistPanelHolder" type="Control" parent="."] +layout_mode = 1 +anchors_preset = 9 +anchor_bottom = 1.0 +offset_left = -30.0 +offset_right = -30.0 +offset_bottom = -190.0 +grow_horizontal = 2 +grow_vertical = 2 +metadata/_edit_use_anchors_ = true + +[node name="PlaylistsPanel" type="Control" parent="PlaylistPanelHolder"] layout_mode = 2 anchors_preset = 0 anchor_bottom = 1.0 offset_left = 19.0 offset_top = 88.0 offset_right = 393.0 -offset_bottom = -132.0 +offset_bottom = 48.0 grow_vertical = 2 script = ExtResource("12_8ie8y") metadata/_edit_use_anchors_ = true -[node name="ColorRect" type="ColorRect" parent="PlaylistsPanel"] +[node name="ColorRect" type="ColorRect" parent="PlaylistPanelHolder/PlaylistsPanel"] layout_mode = 1 anchors_preset = 15 anchor_right = 1.0 @@ -307,7 +317,7 @@ grow_horizontal = 2 grow_vertical = 2 color = Color(0.14902, 0.14902, 0.14902, 1) -[node name="PlaylistsContainer" type="ScrollContainer" parent="PlaylistsPanel"] +[node name="PlaylistsContainer" type="ScrollContainer" parent="PlaylistPanelHolder/PlaylistsPanel"] layout_mode = 1 anchors_preset = -1 anchor_left = 0.0174419 @@ -319,44 +329,44 @@ grow_vertical = 2 follow_focus = true horizontal_scroll_mode = 0 -[node name="VBoxContainer" type="VBoxContainer" parent="PlaylistsPanel/PlaylistsContainer"] +[node name="VBoxContainer" type="VBoxContainer" parent="PlaylistPanelHolder/PlaylistsPanel/PlaylistsContainer"] custom_minimum_size = Vector2(365.295, 0) layout_mode = 2 size_flags_horizontal = 6 size_flags_vertical = 0 -[node name="Label" type="Label" parent="PlaylistsPanel/PlaylistsContainer/VBoxContainer"] +[node name="Label" type="Label" parent="PlaylistPanelHolder/PlaylistsPanel/PlaylistsContainer/VBoxContainer"] layout_mode = 2 size_flags_horizontal = 4 size_flags_vertical = 0 text = "PLAYLISTS" label_settings = SubResource("LabelSettings_0fjy0") -[node name="HBoxContainer" type="HBoxContainer" parent="PlaylistsPanel/PlaylistsContainer/VBoxContainer"] +[node name="HBoxContainer" type="HBoxContainer" parent="PlaylistPanelHolder/PlaylistsPanel/PlaylistsContainer/VBoxContainer"] layout_mode = 2 size_flags_vertical = 4 size_flags_stretch_ratio = 0.0 alignment = 1 -[node name="CreatePlaylist" type="Button" parent="PlaylistsPanel/PlaylistsContainer/VBoxContainer/HBoxContainer"] +[node name="CreatePlaylist" type="Button" parent="PlaylistPanelHolder/PlaylistsPanel/PlaylistsContainer/VBoxContainer/HBoxContainer"] custom_minimum_size = Vector2(155, 42.335) layout_mode = 2 focus_mode = 0 text = "Create Playlist" -[node name="Control" type="Control" parent="PlaylistsPanel/PlaylistsContainer/VBoxContainer/HBoxContainer"] +[node name="Control" type="Control" parent="PlaylistPanelHolder/PlaylistsPanel/PlaylistsContainer/VBoxContainer/HBoxContainer"] custom_minimum_size = Vector2(7.55, 0) layout_mode = 2 -[node name="PlayAll" type="Button" parent="PlaylistsPanel/PlaylistsContainer/VBoxContainer/HBoxContainer"] +[node name="PlayAll" type="Button" parent="PlaylistPanelHolder/PlaylistsPanel/PlaylistsContainer/VBoxContainer/HBoxContainer"] custom_minimum_size = Vector2(155, 42.335) layout_mode = 2 focus_mode = 0 toggle_mode = true text = "Play all" -[node name="PlaylistsHolder" type="VBoxContainer" parent="PlaylistsPanel/PlaylistsContainer/VBoxContainer"] +[node name="PlaylistsHolder" type="VBoxContainer" parent="PlaylistPanelHolder/PlaylistsPanel/PlaylistsContainer/VBoxContainer"] layout_mode = 2 size_flags_vertical = 4 alignment = 1 @@ -571,22 +581,6 @@ focus_mode = 0 shortcut = SubResource("Shortcut_axi6u") text = "Randomize" -[node name="SettingsButton" type="Button" parent="."] -layout_mode = 1 -anchors_preset = 1 -anchor_left = 1.0 -anchor_right = 1.0 -offset_left = -77.0 -offset_top = 23.0 -offset_right = -5.0 -offset_bottom = 95.0 -grow_horizontal = 0 -scale = Vector2(0.79, 0.79) -focus_mode = 0 -shortcut = SubResource("Shortcut_8p5o4") -icon = ExtResource("11_esjel") -script = ExtResource("12_073mb") - [node name="FileDialog" type="FileDialog" parent="."] title = "Open a Directory" position = Vector2i(28, 115) @@ -857,24 +851,47 @@ offset_left = -64.0 offset_top = -23.0 grow_horizontal = 0 grow_vertical = 0 -text = "v1.4.3" +text = "v1.4.4" horizontal_alignment = 2 -[node name="SettingsPopup" type="Control" parent="."] +[node name="SettingsButton" type="Button" parent="."] +layout_mode = 1 +anchors_preset = 1 +anchor_left = 1.0 +anchor_right = 1.0 +offset_left = -77.0 +offset_top = 23.0 +offset_right = -5.0 +offset_bottom = 95.0 +grow_horizontal = 0 +scale = Vector2(0.79, 0.79) +focus_mode = 0 +toggle_mode = true +shortcut = SubResource("Shortcut_8p5o4") +icon = ExtResource("11_esjel") +script = ExtResource("12_073mb") + +[node name="SettingsHolder" type="Control" parent="."] layout_mode = 1 -anchors_preset = 8 anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 anchor_bottom = 0.5 -offset_left = -295.5 -offset_top = -250.5 -offset_right = 295.5 -offset_bottom = 250.5 +offset_top = -294.0 +offset_bottom = -294.0 grow_horizontal = 2 -grow_vertical = 2 -[node name="ColorRect" type="ColorRect" parent="SettingsPopup"] +[node name="SettingsPopup" type="Control" parent="SettingsHolder"] +layout_mode = 1 +anchors_preset = 5 +anchor_left = 0.5 +anchor_right = 0.5 +offset_left = -295.5 +offset_right = 295.5 +offset_bottom = 501.0 +grow_horizontal = 2 + +[node name="ColorRect" type="ColorRect" parent="SettingsHolder/SettingsPopup"] layout_mode = 1 anchors_preset = 15 anchor_right = 1.0 @@ -884,7 +901,7 @@ grow_vertical = 2 color = Color(0.14902, 0.14902, 0.14902, 1) metadata/_edit_use_anchors_ = true -[node name="SettingsMenuChild" parent="SettingsPopup" instance=ExtResource("13_7atry")] +[node name="SettingsMenuChild" parent="SettingsHolder/SettingsPopup" instance=ExtResource("13_7atry")] layout_mode = 1 offset_left = -280.0 offset_top = 8.0 @@ -1102,19 +1119,19 @@ label_settings = SubResource("LabelSettings_ivhc6") horizontal_alignment = 1 [connection signal="toggled" from="SelectPlaylist" to="SelectPlaylist" method="_on_toggled"] -[connection signal="pressed" from="PlaylistsPanel/PlaylistsContainer/VBoxContainer/HBoxContainer/CreatePlaylist" to="PlaylistsPanel" method="_on_create_playlist_pressed"] -[connection signal="toggled" from="PlaylistsPanel/PlaylistsContainer/VBoxContainer/HBoxContainer/PlayAll" to="PlaylistsPanel" method="_on_play_all_toggled"] +[connection signal="pressed" from="PlaylistPanelHolder/PlaylistsPanel/PlaylistsContainer/VBoxContainer/HBoxContainer/CreatePlaylist" to="PlaylistPanelHolder/PlaylistsPanel" method="_on_create_playlist_pressed"] +[connection signal="toggled" from="PlaylistPanelHolder/PlaylistsPanel/PlaylistsContainer/VBoxContainer/HBoxContainer/PlayAll" to="PlaylistPanelHolder/PlaylistsPanel" method="_on_play_all_toggled"] [connection signal="toggled" from="YtTabButton" to="YtTabButton" method="_on_toggled"] [connection signal="dir_selected" from="CreatePlaylistsMenu/FileDialog" to="CreatePlaylistsMenu" method="_on_file_dialog_dir_selected"] [connection signal="text_changed" from="CreatePlaylistsMenu/ScrollContainer/VBoxContainer/PlaylistName" to="CreatePlaylistsMenu" method="_on_playlist_name_text_changed"] [connection signal="pressed" from="CreatePlaylistsMenu/ScrollContainer/VBoxContainer/SelectDirButton" to="CreatePlaylistsMenu" method="_on_select_dir_button_pressed"] [connection signal="pressed" from="CreatePlaylistsMenu/ScrollContainer/VBoxContainer/CreatePlaylistButton" to="CreatePlaylistsMenu" method="_on_create_playlist_button_pressed"] [connection signal="pressed" from="CreatePlaylistsMenu/CloseButton" to="CreatePlaylistsMenu" method="_on_close_button_pressed"] -[connection signal="pressed" from="SettingsButton" to="SettingsButton" method="_on_pressed"] [connection signal="toggled" from="SearchToggle" to="SearchToggle" method="_on_toggled"] [connection signal="text_submitted" from="SearchBar" to="SearchBar" method="_on_text_submitted"] [connection signal="index_pressed" from="SearchResults" to="SearchBar" method="_on_search_results_index_pressed"] [connection signal="toggled" from="VolumeButton" to="VolumeButton" method="_on_toggled"] +[connection signal="toggled" from="SettingsButton" to="SettingsButton" method="_on_toggled"] [connection signal="request_completed" from="UpdateChecker/HTTPRequest" to="UpdateChecker" method="_on_http_request_completed"] [connection signal="request_completed" from="UpdateChecker/DownloadRequest" to="UpdateChecker" method="_on_download_request_completed"] [connection signal="pressed" from="UpdateChecker/ColorRect/LinkButton" to="UpdateChecker" method="_on_link_button_pressed"] diff --git a/addons/discord-rpc-gd/restart_window.tscn b/addons/discord-rpc-gd/restart_window.tscn index 0e8b4b2..0291e94 100644 --- a/addons/discord-rpc-gd/restart_window.tscn +++ b/addons/discord-rpc-gd/restart_window.tscn @@ -9,7 +9,7 @@ Button/styles/focus = SubResource("StyleBoxEmpty_1t7mm") [sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_5vqdt"] -[sub_resource type="Image" id="Image_6qp7c"] +[sub_resource type="Image" id="Image_qsij4"] data = { "data": PackedByteArray(255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 227, 227, 227, 36, 224, 224, 224, 168, 224, 224, 224, 233, 224, 224, 224, 236, 224, 224, 224, 170, 231, 231, 231, 31, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 227, 227, 227, 36, 224, 224, 224, 234, 224, 224, 224, 255, 224, 224, 224, 255, 224, 224, 224, 255, 224, 224, 224, 255, 224, 224, 224, 239, 230, 230, 230, 30, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 224, 224, 224, 168, 224, 224, 224, 255, 224, 224, 224, 186, 224, 224, 224, 32, 224, 224, 224, 33, 224, 224, 224, 187, 224, 224, 224, 255, 225, 225, 225, 167, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 224, 224, 224, 237, 224, 224, 224, 255, 224, 224, 224, 33, 255, 255, 255, 0, 255, 255, 255, 0, 227, 227, 227, 36, 224, 224, 224, 255, 224, 224, 224, 234, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 224, 224, 224, 237, 224, 224, 224, 255, 224, 224, 224, 33, 255, 255, 255, 0, 255, 255, 255, 0, 229, 229, 229, 38, 224, 224, 224, 255, 224, 224, 224, 229, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 224, 224, 224, 164, 224, 224, 224, 255, 224, 224, 224, 187, 225, 225, 225, 34, 227, 227, 227, 36, 224, 224, 224, 192, 224, 224, 224, 255, 224, 224, 224, 162, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 224, 224, 224, 24, 225, 225, 225, 215, 224, 224, 224, 255, 224, 224, 224, 255, 224, 224, 224, 255, 224, 224, 224, 255, 224, 224, 224, 255, 224, 224, 224, 229, 224, 224, 224, 32, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 224, 224, 224, 24, 224, 224, 224, 216, 224, 224, 224, 255, 224, 224, 224, 210, 224, 224, 224, 161, 224, 224, 224, 232, 224, 224, 224, 231, 225, 225, 225, 159, 230, 230, 230, 30, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 224, 224, 224, 107, 224, 224, 224, 255, 224, 224, 224, 210, 230, 230, 230, 20, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 224, 224, 224, 105, 230, 230, 230, 20, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 224, 224, 224, 255, 224, 224, 224, 255, 224, 224, 224, 221, 224, 224, 224, 130, 255, 255, 255, 1, 255, 255, 255, 1, 225, 225, 225, 134, 224, 224, 224, 224, 225, 225, 225, 223, 224, 224, 224, 132, 255, 255, 255, 1, 255, 255, 255, 6, 224, 224, 224, 137, 224, 224, 224, 231, 224, 224, 224, 255, 255, 255, 255, 0, 224, 224, 224, 255, 224, 224, 224, 255, 224, 224, 224, 255, 224, 224, 224, 255, 224, 224, 224, 130, 225, 225, 225, 133, 224, 224, 224, 255, 224, 224, 224, 255, 224, 224, 224, 255, 224, 224, 224, 255, 224, 224, 224, 129, 224, 224, 224, 137, 224, 224, 224, 255, 224, 224, 224, 255, 224, 224, 224, 255, 255, 255, 255, 0, 224, 224, 224, 255, 224, 224, 224, 255, 224, 224, 224, 65, 224, 224, 224, 255, 224, 224, 224, 220, 225, 225, 225, 223, 224, 224, 224, 255, 226, 226, 226, 61, 224, 224, 224, 65, 224, 224, 224, 255, 224, 224, 224, 222, 224, 224, 224, 231, 224, 224, 224, 255, 227, 227, 227, 62, 255, 255, 255, 0, 255, 255, 255, 0, 224, 224, 224, 255, 224, 224, 224, 255, 225, 225, 225, 67, 224, 224, 224, 255, 224, 224, 224, 219, 224, 224, 224, 222, 224, 224, 224, 255, 227, 227, 227, 63, 225, 225, 225, 67, 224, 224, 224, 255, 224, 224, 224, 219, 224, 224, 224, 230, 224, 224, 224, 255, 227, 227, 227, 63, 255, 255, 255, 0, 255, 255, 255, 0, 224, 224, 224, 255, 224, 224, 224, 255, 224, 224, 224, 255, 224, 224, 224, 255, 225, 225, 225, 127, 224, 224, 224, 129, 224, 224, 224, 255, 224, 224, 224, 255, 224, 224, 224, 255, 224, 224, 224, 255, 225, 225, 225, 126, 225, 225, 225, 135, 224, 224, 224, 255, 224, 224, 224, 255, 224, 224, 224, 255, 255, 255, 255, 0, 224, 224, 224, 255, 224, 224, 224, 255, 224, 224, 224, 221, 225, 225, 225, 127, 255, 255, 255, 0, 255, 255, 255, 1, 224, 224, 224, 128, 224, 224, 224, 220, 224, 224, 224, 219, 225, 225, 225, 127, 255, 255, 255, 0, 255, 255, 255, 5, 225, 225, 225, 134, 224, 224, 224, 229, 224, 224, 224, 255, 255, 255, 255, 0), "format": "RGBA8", @@ -19,7 +19,7 @@ data = { } [sub_resource type="ImageTexture" id="ImageTexture_gdtpn"] -image = SubResource("Image_6qp7c") +image = SubResource("Image_qsij4") [sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_7v0rg"] diff --git a/main.gd b/main.gd index ee8fbc4..9d07c30 100644 --- a/main.gd +++ b/main.gd @@ -22,11 +22,11 @@ extends Control @onready var version: Label = $Version @onready var paused_indicator: TextureRect = $PausedIndicator @onready var settings_popup: Control = $SettingsPopup -@onready var settings_menu_child: Settings = $SettingsPopup/SettingsMenuChild +@onready var settings_menu_child: Settings = $SettingsHolder/SettingsPopup/SettingsMenuChild @onready var artist_name: Label = $ArtistName @onready var user_bg: TextureRect = $UserBG @onready var playlists_panel: Control = $PlaylistsPanel -@onready var playlists_holder: VBoxContainer = $PlaylistsPanel/PlaylistsContainer/VBoxContainer/PlaylistsHolder +@onready var playlists_holder: VBoxContainer = $PlaylistPanelHolder/PlaylistsPanel/PlaylistsContainer/VBoxContainer/PlaylistsHolder @onready var play_all: Button = $PlaylistsPanel/PlaylistsContainer/VBoxContainer/HBoxContainer/PlayAll @onready var album_name: Label = $Album @onready var playlist_or_song: ConfirmationDialog = $PlaylistOrSong @@ -67,7 +67,7 @@ var PlayAllLists:bool # Called when the node enters the scene tree for the first time. func _ready() -> void: - get_tree().root.min_size = Vector2(850,459) + get_tree().root.min_size = Vector2(850,492) current_progress.drag_ended.connect(SongDragStopped) current_progress.drag_started.connect(SongDragStarted) loop.pressed.connect(LoopSong) diff --git a/select_playlist.gd b/select_playlist.gd index b12c8b6..34ada27 100644 --- a/select_playlist.gd +++ b/select_playlist.gd @@ -1,10 +1,23 @@ extends Button -@onready var playlists_panel: Control = $"../PlaylistsPanel" +@onready var playlists_panel: Control = $"../PlaylistPanelHolder/PlaylistsPanel" +var currentlyExtending:bool +var Target:float = 50 - - -func _on_toggled(toggled_on: bool) -> void: - if toggled_on: +func _process(delta: float) -> void: + if currentlyExtending: + playlists_panel.position.x = clamp(lerp(playlists_panel.position.x,Target,0.25),0,100) + else: + playlists_panel.position.x -=1 + playlists_panel.position.x = clamp(lerp(Target,playlists_panel.position.x,1.25),0,100) + playlists_panel.modulate.a = playlists_panel.position.x / Target + if playlists_panel.position.x > 1: playlists_panel.show() else: playlists_panel.hide() + +func _on_toggled(toggled_on: bool) -> void: + if toggled_on: + currentlyExtending = true + playlists_panel.position.x = 1 + else: + currentlyExtending = false diff --git a/settings.gd b/settings.gd index 46da5e5..c352b16 100644 --- a/settings.gd +++ b/settings.gd @@ -74,7 +74,7 @@ func _on_h_slider_drag_ended(value_changed: bool) -> void: Parent.SaveEverything() func _on_exit_pressed() -> void: - get_parent().hide() + Parent.find_child("SettingsButton").button_pressed = false Parent.SaveEverything() #region Reverb diff --git a/settings_button.gd b/settings_button.gd index 085a5dc..9a32973 100644 --- a/settings_button.gd +++ b/settings_button.gd @@ -1,19 +1,25 @@ extends Button -@onready var settings_popup: Control = $"../SettingsPopup" +@onready var settings_popup: Control = $"../SettingsHolder/SettingsPopup" +var currentlyExtending:bool +var Target:float = 50 -# Called when the node enters the scene tree for the first time. -func _ready() -> void: - pass # Replace with function body. - - -# Called every frame. 'delta' is the elapsed time since the previous frame. func _process(delta: float) -> void: - pass - - -func _on_pressed() -> void: - if settings_popup.visible: - settings_popup.hide() + if currentlyExtending: + settings_popup.position.y = clamp(lerp(settings_popup.position.y,Target,0.25),0,100) else: + settings_popup.position.y -=1 + settings_popup.position.y = clamp(lerp(Target,settings_popup.position.y,1.25),0,100) + settings_popup.modulate.a = settings_popup.position.y / Target + if settings_popup.position.y > 1: settings_popup.show() + else: + settings_popup.hide() + +func _on_toggled(toggled_on: bool) -> void: + print("@@") + if toggled_on: + currentlyExtending = true + settings_popup.position.y = 1 + else: + currentlyExtending = false diff --git a/update_checker.gd b/update_checker.gd index 82c6d3e..4b3edc8 100644 --- a/update_checker.gd +++ b/update_checker.gd @@ -46,10 +46,11 @@ func _on_http_request_completed(result: int, _response_code: int, _headers: Pack var json = JSON.new() var result2 = json.parse_string(str(body.get_string_from_utf8())) print("! AHHH " + str(result2)) - if result2["tag_name"] != version.text: - update_available_text.text = result2["tag_name"] + " Is Out!" - show() - updateLink = result2["html_url"] + if result2.has("tag_name"): + if result2["tag_name"] != version.text: + update_available_text.text = result2["tag_name"] + " Is Out!" + show() + updateLink = result2["html_url"] func _on_close_buen_pressed() -> void: hide()