diff --git a/assets/graphics/layers/fx.png b/assets/graphics/layers/fx.png new file mode 100644 index 000000000..f387dcaad Binary files /dev/null and b/assets/graphics/layers/fx.png differ diff --git a/assets/graphics/layers/fx.png.import b/assets/graphics/layers/fx.png.import new file mode 100644 index 000000000..49feeef5a --- /dev/null +++ b/assets/graphics/layers/fx.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dt6cysvv1w77u" +path="res://.godot/imported/fx.png-1b545437fec5adf83ee72751efbbe37b.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/graphics/layers/fx.png" +dest_files=["res://.godot/imported/fx.png-1b545437fec5adf83ee72751efbbe37b.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 diff --git a/src/UI/Timeline/AnimationTimeline.tscn b/src/UI/Timeline/AnimationTimeline.tscn index ffc44035d..23a4add70 100644 --- a/src/UI/Timeline/AnimationTimeline.tscn +++ b/src/UI/Timeline/AnimationTimeline.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=76 format=3 uid="uid://dbr6mulku2qju"] +[gd_scene load_steps=77 format=3 uid="uid://dbr6mulku2qju"] [ext_resource type="Script" path="res://src/UI/Timeline/AnimationTimeline.gd" id="1"] [ext_resource type="Texture2D" uid="uid://d36mlbmq06q4e" path="res://assets/graphics/layers/new.png" id="2"] @@ -9,6 +9,7 @@ [ext_resource type="Texture2D" uid="uid://d3gx4phcox58s" path="res://assets/graphics/layers/clone.png" id="7"] [ext_resource type="Texture2D" uid="uid://d1oxrkwndy5fi" path="res://assets/graphics/timeline/move_arrow.png" id="8"] [ext_resource type="PackedScene" uid="uid://yjhp0ssng2mp" path="res://src/UI/Nodes/ValueSlider.tscn" id="9"] +[ext_resource type="Texture2D" uid="uid://dt6cysvv1w77u" path="res://assets/graphics/layers/fx.png" id="9_yphnd"] [ext_resource type="Texture2D" uid="uid://ct8wn8m6x4m54" path="res://assets/graphics/misc/value_arrow.svg" id="10"] [ext_resource type="Script" path="res://src/UI/Timeline/FrameScrollContainer.gd" id="11"] [ext_resource type="Script" path="res://src/UI/Timeline/PasteTagPopup.gd" id="12"] @@ -211,7 +212,8 @@ mouse_default_cursor_shape = 2 shortcut = SubResource("Shortcut_tpvn2") [node name="TextureRect" type="TextureRect" parent="TimelineContainer/TimelineButtons/LayerTools/LayerSettingsContainer/LayerButtons/AddLayer"] -layout_mode = 0 +layout_mode = 1 +anchors_preset = 4 anchor_top = 0.5 anchor_bottom = 0.5 offset_top = -11.0 @@ -220,6 +222,7 @@ offset_bottom = 11.0 size_flags_horizontal = 0 size_flags_vertical = 0 texture = ExtResource("2") +stretch_mode = 3 [node name="AddLayerList" type="MenuButton" parent="TimelineContainer/TimelineButtons/LayerTools/LayerSettingsContainer/LayerButtons/AddLayer"] unique_name_in_owner = true @@ -266,18 +269,16 @@ disabled = true shortcut = SubResource("Shortcut_xar00") [node name="TextureRect" type="TextureRect" parent="TimelineContainer/TimelineButtons/LayerTools/LayerSettingsContainer/LayerButtons/RemoveLayer"] -layout_mode = 0 -anchor_left = 0.5 -anchor_top = 0.5 -anchor_right = 0.5 -anchor_bottom = 0.5 -offset_left = -7.0 -offset_top = -7.0 -offset_right = 7.0 -offset_bottom = 7.0 +layout_mode = 1 +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 size_flags_horizontal = 0 size_flags_vertical = 0 texture = ExtResource("6") +stretch_mode = 3 [node name="MoveUpLayer" type="Button" parent="TimelineContainer/TimelineButtons/LayerTools/LayerSettingsContainer/LayerButtons" groups=["UIButtons"]] unique_name_in_owner = true @@ -292,18 +293,16 @@ disabled = true shortcut = SubResource("Shortcut_r300c") [node name="TextureRect" type="TextureRect" parent="TimelineContainer/TimelineButtons/LayerTools/LayerSettingsContainer/LayerButtons/MoveUpLayer"] -layout_mode = 0 -anchor_left = 0.5 -anchor_top = 0.5 -anchor_right = 0.5 -anchor_bottom = 0.5 -offset_left = -11.0 -offset_top = -11.0 -offset_right = 11.0 -offset_bottom = 11.0 +layout_mode = 1 +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 size_flags_horizontal = 0 size_flags_vertical = 0 texture = ExtResource("4") +stretch_mode = 3 [node name="MoveDownLayer" type="Button" parent="TimelineContainer/TimelineButtons/LayerTools/LayerSettingsContainer/LayerButtons" groups=["UIButtons"]] unique_name_in_owner = true @@ -318,18 +317,16 @@ disabled = true shortcut = SubResource("Shortcut_763li") [node name="TextureRect" type="TextureRect" parent="TimelineContainer/TimelineButtons/LayerTools/LayerSettingsContainer/LayerButtons/MoveDownLayer"] -layout_mode = 0 -anchor_left = 0.5 -anchor_top = 0.5 -anchor_right = 0.5 -anchor_bottom = 0.5 -offset_left = -11.0 -offset_top = -11.0 -offset_right = 11.0 -offset_bottom = 11.0 +layout_mode = 1 +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 size_flags_horizontal = 0 size_flags_vertical = 0 texture = ExtResource("3") +stretch_mode = 3 [node name="CloneLayer" type="Button" parent="TimelineContainer/TimelineButtons/LayerTools/LayerSettingsContainer/LayerButtons" groups=["UIButtons"]] custom_minimum_size = Vector2(24, 24) @@ -342,18 +339,16 @@ mouse_default_cursor_shape = 2 shortcut = SubResource("Shortcut_0o4ap") [node name="TextureRect" type="TextureRect" parent="TimelineContainer/TimelineButtons/LayerTools/LayerSettingsContainer/LayerButtons/CloneLayer"] -layout_mode = 0 -anchor_left = 0.5 -anchor_top = 0.5 -anchor_right = 0.5 -anchor_bottom = 0.5 -offset_left = -11.0 -offset_top = -11.0 -offset_right = 11.0 -offset_bottom = 11.0 +layout_mode = 1 +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 size_flags_horizontal = 0 size_flags_vertical = 0 texture = ExtResource("7") +stretch_mode = 3 [node name="MergeDownLayer" type="Button" parent="TimelineContainer/TimelineButtons/LayerTools/LayerSettingsContainer/LayerButtons" groups=["UIButtons"]] unique_name_in_owner = true @@ -368,25 +363,34 @@ disabled = true shortcut = SubResource("Shortcut_wbf7k") [node name="TextureRect" type="TextureRect" parent="TimelineContainer/TimelineButtons/LayerTools/LayerSettingsContainer/LayerButtons/MergeDownLayer"] -layout_mode = 0 -anchor_left = 0.5 -anchor_top = 0.5 -anchor_right = 0.5 -anchor_bottom = 0.5 -offset_left = -11.0 -offset_top = -11.0 -offset_right = 11.0 -offset_bottom = 11.0 +layout_mode = 1 +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 size_flags_horizontal = 0 size_flags_vertical = 0 texture = ExtResource("5") +stretch_mode = 3 -[node name="LayerFX" type="Button" parent="TimelineContainer/TimelineButtons/LayerTools/LayerSettingsContainer/LayerButtons"] +[node name="LayerFX" type="Button" parent="TimelineContainer/TimelineButtons/LayerTools/LayerSettingsContainer/LayerButtons" groups=["UIButtons"]] custom_minimum_size = Vector2(24, 24) layout_mode = 2 size_flags_vertical = 4 mouse_default_cursor_shape = 2 -text = "FX" + +[node name="TextureRect" type="TextureRect" parent="TimelineContainer/TimelineButtons/LayerTools/LayerSettingsContainer/LayerButtons/LayerFX"] +layout_mode = 1 +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 +size_flags_horizontal = 0 +size_flags_vertical = 0 +texture = ExtResource("9_yphnd") +stretch_mode = 3 [node name="BlendContainer" type="HBoxContainer" parent="TimelineContainer/TimelineButtons/LayerTools/LayerSettingsContainer"] layout_mode = 2 diff --git a/src/UI/TopMenuContainer/TopMenuContainer.tscn b/src/UI/TopMenuContainer/TopMenuContainer.tscn index 1a238e023..9ecc89956 100644 --- a/src/UI/TopMenuContainer/TopMenuContainer.tscn +++ b/src/UI/TopMenuContainer/TopMenuContainer.tscn @@ -7,7 +7,6 @@ custom_minimum_size = Vector2(0, 28) offset_right = 1280.0 offset_bottom = 28.0 -theme_type_variation = &"TopMenuPanel" script = ExtResource("2") [node name="MenuItems" type="HBoxContainer" parent="."] diff --git a/src/UI/UI.tscn b/src/UI/UI.tscn index ef838d590..ad74d833a 100644 --- a/src/UI/UI.tscn +++ b/src/UI/UI.tscn @@ -245,6 +245,8 @@ script = ExtResource("37") layout_mode = 0 anchor_right = 1.0 anchor_bottom = 1.0 +offset_left = 8.0 +offset_right = -8.0 size_flags_horizontal = 3 size_flags_vertical = 3 script = ExtResource("35") @@ -308,7 +310,7 @@ camera_path = NodePath("SubViewport/Camera2D") [node name="SubViewport" type="SubViewport" parent="DockableContainer/Main Canvas/ViewportandVerticalRuler/SubViewportContainer"] handle_input_locally = false canvas_item_default_texture_filter = 0 -size = Vector2i(861, 503) +size = Vector2i(850, 503) render_target_update_mode = 4 [node name="TransparentChecker" parent="DockableContainer/Main Canvas/ViewportandVerticalRuler/SubViewportContainer/SubViewport" instance=ExtResource("5")]