diff --git a/Assets/DefaultTheme.tres b/Assets/DefaultTheme.tres index 39ea386..9ce3e06 100644 --- a/Assets/DefaultTheme.tres +++ b/Assets/DefaultTheme.tres @@ -1,4 +1,4 @@ -[gd_resource type="Theme" load_steps=228 format=3 uid="uid://b8rk41gjual2b"] +[gd_resource type="Theme" load_steps=229 format=3 uid="uid://b8rk41gjual2b"] [ext_resource type="FontFile" uid="uid://501bous51s3p" path="res://Assets/Fonts/Inter-Regular.ttf" id="1_a74l0"] [ext_resource type="Texture2D" uid="uid://blqywcg2e22in" path="res://Assets/Icons/checked.svg" id="2_jlkvh"] @@ -2437,12 +2437,24 @@ border_color = Color(0.337255, 0.619608, 1, 1) corner_detail = 1 anti_aliasing = false -[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_ek1lj"] +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_k6s8r"] +content_margin_left = 7.0 +content_margin_top = 2.0 +content_margin_right = 7.0 +content_margin_bottom = 2.0 +bg_color = Color(0.101961, 0.101961, 0.101961, 1) +border_color = Color(0.101569, 0.101569, 0.101569, 1) +corner_radius_top_left = 4 +corner_radius_top_right = 4 +corner_radius_bottom_right = 4 +corner_radius_bottom_left = 4 + +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_opcwo"] content_margin_left = 6.0 content_margin_top = 4.0 content_margin_right = 6.0 content_margin_bottom = 4.0 -bg_color = Color(0.116078, 0.116078, 0.116078, 1) +bg_color = Color(0.06, 0.06, 0.06, 1) corner_detail = 3 anti_aliasing = false @@ -4428,7 +4440,8 @@ Timeline/colors/line_primary_color = Color(0.4, 0.4, 0.4, 1) Timeline/colors/line_secondary_color = Color(0.2, 0.2, 0.2, 1) Timeline/constants/time_label_offset_x = 30 Timeline/constants/time_label_offset_y = 20 -Timeline/styles/top_panel = SubResource("StyleBoxFlat_ek1lj") +Timeline/styles/background = SubResource("StyleBoxFlat_k6s8r") +Timeline/styles/top_panel = SubResource("StyleBoxFlat_opcwo") TooltipLabel/colors/font_color = Color(0.893137, 0.893137, 0.893137, 1) TooltipLabel/colors/font_shadow_color = Color(0, 0, 0, 0) TooltipPanel/styles/panel = SubResource("StyleBoxFlat_qr21i") diff --git a/Assets/Icons/settings.svg b/Assets/Icons/settings.svg new file mode 100644 index 0000000..551161c --- /dev/null +++ b/Assets/Icons/settings.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Assets/Icons/settings.svg.import b/Assets/Icons/settings.svg.import new file mode 100644 index 0000000..b02d4e0 --- /dev/null +++ b/Assets/Icons/settings.svg.import @@ -0,0 +1,37 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bis8t1jv3itus" +path="res://.godot/imported/settings.svg-2aa0f389da6ad0a7e346738ae84fd469.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Icons/settings.svg" +dest_files=["res://.godot/imported/settings.svg-2aa0f389da6ad0a7e346738ae84fd469.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=true +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 +svg/scale=1.0 +editor/scale_with_editor_scale=false +editor/convert_colors_with_editor_theme=false diff --git a/Assets/Icons/slider_grabber.svg b/Assets/Icons/slider_grabber.svg new file mode 100644 index 0000000..ed6bad9 --- /dev/null +++ b/Assets/Icons/slider_grabber.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Assets/Icons/slider_grabber.svg.import b/Assets/Icons/slider_grabber.svg.import new file mode 100644 index 0000000..a75243f --- /dev/null +++ b/Assets/Icons/slider_grabber.svg.import @@ -0,0 +1,37 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://c8napjmkltpr" +path="res://.godot/imported/slider_grabber.svg-17a4a0fc1ef60abefaecb64e7bfdf9fc.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Icons/slider_grabber.svg" +dest_files=["res://.godot/imported/slider_grabber.svg-17a4a0fc1ef60abefaecb64e7bfdf9fc.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 +svg/scale=1.0 +editor/scale_with_editor_scale=false +editor/convert_colors_with_editor_theme=false diff --git a/Controls/AudioTrack.tscn b/Controls/AudioTrack.tscn index 31813dd..6740183 100644 --- a/Controls/AudioTrack.tscn +++ b/Controls/AudioTrack.tscn @@ -1,10 +1,22 @@ -[gd_scene load_steps=3 format=3 uid="uid://dlb5xpe1t8rrk"] +[gd_scene load_steps=6 format=3 uid="uid://dlb5xpe1t8rrk"] [ext_resource type="PackedScene" uid="uid://c3kajrpp2ux7" path="res://Controls/Track.tscn" id="1_envsv"] [ext_resource type="Texture2D" uid="uid://cc0dy71y8shcx" path="res://Assets/Icons/record.svg" id="2_iwhga"] +[ext_resource type="Texture2D" uid="uid://c8napjmkltpr" path="res://Assets/Icons/slider_grabber.svg" id="3_y81l0"] + +[sub_resource type="StyleBoxLine" id="StyleBoxLine_ixeae"] +color = Color(0.1, 0.1, 0.1, 1) +thickness = 8 + +[sub_resource type="StyleBoxLine" id="StyleBoxLine_vrgqc"] +color = Color(0.5, 0.5, 0.5, 1) +thickness = 8 [node name="Track" instance=ExtResource("1_envsv")] +[node name="HBoxContainer" parent="PanelContainer/HBoxContainer/Body" index="0"] +theme_override_constants/separation = 8 + [node name="MuteSolo" type="VBoxContainer" parent="PanelContainer/HBoxContainer/Body/HBoxContainer" index="0"] layout_mode = 2 theme_override_constants/separation = 4 @@ -32,5 +44,10 @@ icon_alignment = 1 [node name="VolumeSlider" type="HSlider" parent="PanelContainer/HBoxContainer/Body/HBoxContainer/NameIconControls" index="1"] layout_mode = 2 +theme_override_icons/grabber = ExtResource("3_y81l0") +theme_override_icons/grabber_highlight = ExtResource("3_y81l0") +theme_override_styles/slider = SubResource("StyleBoxLine_ixeae") +theme_override_styles/grabber_area = SubResource("StyleBoxLine_vrgqc") +theme_override_styles/grabber_area_highlight = SubResource("StyleBoxLine_vrgqc") min_value = -80.0 max_value = 0.0 diff --git a/Scripts/Timeline.gd b/Scripts/Timeline.gd index b352830..ebf8137 100644 --- a/Scripts/Timeline.gd +++ b/Scripts/Timeline.gd @@ -1,6 +1,6 @@ @tool class_name Timeline -extends Control +extends Container @export var track_list: VBoxContainer @@ -44,6 +44,10 @@ func _draw(): var time_label_offset_x = get_theme_constant("time_label_offset_x", "Timeline") var time_label_offset_y = get_theme_constant("time_label_offset_y", "Timeline") + # background + var background_stylebox = get_theme_stylebox("background", "Timeline") + draw_style_box(background_stylebox, Rect2(0.0, 0.0, size.x, size.y)) + # top panel var stylebox = get_theme_stylebox("top_panel", "Timeline") draw_style_box(stylebox, Rect2(0.0, 0.0, size.x, 28.0)) @@ -77,10 +81,10 @@ func _gui_input(event): zoom *= zoom_factor queue_redraw() if event is InputEventMouseButton and event.button_index == MOUSE_BUTTON_WHEEL_LEFT: - time_offset -= 50 / zoom + time_offset -= 10 queue_redraw() if event is InputEventMouseButton and event.button_index == MOUSE_BUTTON_WHEEL_RIGHT: - time_offset += 50 / zoom + time_offset += 10 queue_redraw() zoom = max(min_zoom, zoom) diff --git a/Views/Timeline.tscn b/Views/Timeline.tscn index 6e5bf21..a439f6c 100644 --- a/Views/Timeline.tscn +++ b/Views/Timeline.tscn @@ -2,8 +2,7 @@ [ext_resource type="Script" path="res://Scripts/Timeline.gd" id="1_h2mev"] -[node name="Timeline" type="Control"] -layout_mode = 3 +[node name="Timeline" type="Container"] anchors_preset = 15 anchor_right = 1.0 anchor_bottom = 1.0 @@ -14,23 +13,6 @@ script = ExtResource("1_h2mev") end_time = 4000.0 [node name="ScrollBar" type="HScrollBar" parent="."] +visible = false custom_minimum_size = Vector2(0, 20) -layout_mode = 1 -anchors_preset = -1 -anchor_top = 0.97 -anchor_right = 1.0 -anchor_bottom = 1.0 -offset_top = 24.4 -grow_horizontal = 2 -grow_vertical = 0 - -[node name="Panel" type="Panel" parent="."] -modulate = Color(0.674815, 0.674815, 0.674814, 1) -show_behind_parent = true -layout_mode = 1 -anchors_preset = 15 -anchor_right = 1.0 -anchor_bottom = 1.0 -grow_horizontal = 2 -grow_vertical = 2 -mouse_filter = 2 +layout_mode = 2