huskee/Pixelorama
1
0
Fork 0
mirror of https://github.com/Orama-Interactive/Pixelorama.git synced 2025-01-18 09:09:47 +00:00
Code Issues Wiki Activity

Timeline UI improvements, better visual indication of the cels that are selected and the cels that are linked

Browse source
This commit is contained in:
OverloadedOrama 2024-02-08 20:46:07 +02:00
parent ee7750dd40
commit 12036364b5
12 changed files with 246 additions and 107 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

126
assets/themes/dark/theme.tres
View file

@ -1,12 +1,12 @@
[gd_resource type="Theme" load_steps=81 format=3 uid="uid://bka2dkyhkqpmq"] [gd_resource type="Theme" load_steps=86 format=3 uid="uid://d6j8rvqw7ekv"]
[ext_resource type="Texture2D" uid="uid://brdgp0y4tarar" path="res://assets/graphics/misc/radio_unpressed.png" id="1_d5k4r"] [ext_resource type="Texture2D" uid="uid://brdgp0y4tarar" path="res://assets/graphics/misc/radio_unpressed.png" id="1_tb0vl"]
[ext_resource type="Texture2D" uid="uid://ybfsxkc2qap7" path="res://assets/graphics/misc/checkbox_unpressed.png" id="2_g65j0"] [ext_resource type="Texture2D" uid="uid://ybfsxkc2qap7" path="res://assets/graphics/misc/checkbox_unpressed.png" id="2_0k8lk"]
[ext_resource type="Texture2D" uid="uid://ct8wn8m6x4m54" path="res://assets/graphics/misc/value_arrow.svg" id="3_xwrfs"] [ext_resource type="Texture2D" uid="uid://ct8wn8m6x4m54" path="res://assets/graphics/misc/value_arrow.svg" id="3_rog17"]
[ext_resource type="Texture2D" uid="uid://bq8h66v4ie8xl" path="res://assets/graphics/misc/value_arrow_hover.svg" id="4_upj71"] [ext_resource type="Texture2D" uid="uid://bq8h66v4ie8xl" path="res://assets/graphics/misc/value_arrow_hover.svg" id="4_ek41l"]
[ext_resource type="Texture2D" uid="uid://hhxenhteahv6" path="res://assets/graphics/misc/value_arrow_press.svg" id="5_wrq0c"] [ext_resource type="Texture2D" uid="uid://hhxenhteahv6" path="res://assets/graphics/misc/value_arrow_press.svg" id="5_x3r05"]
[ext_resource type="Texture2D" uid="uid://c7u0yofrpm50a" path="res://assets/graphics/misc/value_slider.png" id="6_4cw4d"] [ext_resource type="Texture2D" uid="uid://c7u0yofrpm50a" path="res://assets/graphics/misc/value_slider.png" id="6_p4erc"]
[ext_resource type="FontFile" uid="uid://cvc4lelf6hl7x" path="res://assets/fonts/Roboto-Regular.ttf" id="7_rwjb0"] [ext_resource type="FontFile" uid="uid://cvc4lelf6hl7x" path="res://assets/fonts/Roboto-Regular.ttf" id="7_cigbv"]
[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_755mo"] [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_755mo"]
content_margin_left = 8.0 content_margin_left = 8.0
@ -45,7 +45,7 @@ content_margin_left = 6.0
content_margin_top = 4.0 content_margin_top = 4.0
content_margin_right = 6.0 content_margin_right = 6.0
content_margin_bottom = 4.0 content_margin_bottom = 4.0
bg_color = Color(0.0901961, 0.0901961, 0.0901961, 0.5) bg_color = Color(0.231373, 0.231373, 0.231373, 0.5)
border_color = Color(1, 1, 1, 1) border_color = Color(1, 1, 1, 1)
[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_t0f5f"] [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_t0f5f"]
@ -60,6 +60,57 @@ border_width_right = 1
border_width_bottom = 1 border_width_bottom = 1
border_color = Color(1, 1, 1, 1) border_color = Color(1, 1, 1, 1)
[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_1qcnj"]
content_margin_left = 6.0
content_margin_top = 4.0
content_margin_right = 6.0
content_margin_bottom = 4.0
bg_color = Color(0.231373, 0.231373, 0.231373, 1)
border_width_left = 1
border_width_top = 1
border_width_right = 1
border_width_bottom = 1
border_color = Color(0.0901961, 0.0901961, 0.0901961, 1)
[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_8hww6"]
content_margin_left = 6.0
content_margin_top = 4.0
content_margin_right = 6.0
content_margin_bottom = 4.0
bg_color = Color(0.231373, 0.231373, 0.231373, 0.5)
border_width_left = 1
border_width_top = 1
border_width_right = 1
border_width_bottom = 1
border_color = Color(0.0901961, 0.0901961, 0.0901961, 1)
[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_a57y0"]
content_margin_left = 6.0
content_margin_top = 4.0
content_margin_right = 6.0
content_margin_bottom = 4.0
bg_color = Color(0.141176, 0.141176, 0.141176, 1)
border_width_left = 1
border_width_top = 1
border_width_right = 1
border_width_bottom = 1
border_color = Color(0.0901961, 0.0901961, 0.0901961, 1)
[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_t43bd"]
content_margin_left = 6.0
content_margin_top = 4.0
content_margin_right = 6.0
content_margin_bottom = 4.0
border_width_left = 3
border_width_top = 3
border_width_right = 3
border_width_bottom = 3
border_color = Color(1, 1, 1, 1)
expand_margin_left = 2.0
expand_margin_top = 2.0
expand_margin_right = 2.0
expand_margin_bottom = 2.0
[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_lbyuh"] [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_lbyuh"]
content_margin_top = 4.0 content_margin_top = 4.0
content_margin_bottom = 4.0 content_margin_bottom = 4.0
@ -294,6 +345,22 @@ border_color = Color(0.113281, 0.113281, 0.113281, 1)
content_margin_top = 4.0 content_margin_top = 4.0
content_margin_bottom = 4.0 content_margin_bottom = 4.0
[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_o72qi"]
content_margin_left = 6.0
content_margin_top = 4.0
content_margin_right = 6.0
content_margin_bottom = 4.0
bg_color = Color(0.231373, 0.231373, 0.231373, 1)
border_width_left = 3
border_width_top = 3
border_width_right = 3
border_width_bottom = 3
border_color = Color(1, 1, 1, 1)
expand_margin_left = 2.0
expand_margin_top = 2.0
expand_margin_right = 2.0
expand_margin_bottom = 2.0
[sub_resource type="StyleBoxFlat" id="3"] [sub_resource type="StyleBoxFlat" id="3"]
content_margin_left = 6.0 content_margin_left = 6.0
content_margin_top = 4.0 content_margin_top = 4.0
@ -589,7 +656,7 @@ border_color = Color(0.334961, 0.334961, 0.334961, 1)
[sub_resource type="StyleBoxEmpty" id="159"] [sub_resource type="StyleBoxEmpty" id="159"]
[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_tcenw"] [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_tcenw"]
bg_color = Color(0.0901961, 0.0901961, 0.0901961, 1) bg_color = Color(0.141176, 0.141176, 0.141176, 1)
[sub_resource type="StyleBoxFlat" id="161"] [sub_resource type="StyleBoxFlat" id="161"]
content_margin_left = 4.0 content_margin_left = 4.0
@ -672,7 +739,7 @@ expand_margin_bottom = 4.0
[resource] [resource]
resource_name = "Dark" resource_name = "Dark"
default_font = ExtResource("7_rwjb0") default_font = ExtResource("7_cigbv")
default_font_size = 16 default_font_size = 16
AcceptDialog/styles/panel = SubResource("StyleBoxFlat_755mo") AcceptDialog/styles/panel = SubResource("StyleBoxFlat_755mo")
BoxContainer/constants/separation = 4 BoxContainer/constants/separation = 4
@ -693,10 +760,15 @@ Button/styles/focus = SubResource("StyleBoxFlat_kpwev")
Button/styles/hover = SubResource("StyleBoxFlat_nv6tl") Button/styles/hover = SubResource("StyleBoxFlat_nv6tl")
Button/styles/normal = SubResource("23") Button/styles/normal = SubResource("23")
Button/styles/pressed = SubResource("StyleBoxFlat_t0f5f") Button/styles/pressed = SubResource("StyleBoxFlat_t0f5f")
CheckBox/icons/radio_unchecked = ExtResource("1_d5k4r") CelButton/base_type = &"Button"
CheckBox/icons/radio_unchecked_disabled = ExtResource("1_d5k4r") CelButton/styles/guide = SubResource("StyleBoxFlat_1qcnj")
CheckBox/icons/unchecked = ExtResource("2_g65j0") CelButton/styles/hover = SubResource("StyleBoxFlat_8hww6")
CheckBox/icons/unchecked_disabled = ExtResource("2_g65j0") CelButton/styles/normal = SubResource("StyleBoxFlat_a57y0")
CelButton/styles/pressed = SubResource("StyleBoxFlat_t43bd")
CheckBox/icons/radio_unchecked = ExtResource("1_tb0vl")
CheckBox/icons/radio_unchecked_disabled = ExtResource("1_tb0vl")
CheckBox/icons/unchecked = ExtResource("2_0k8lk")
CheckBox/icons/unchecked_disabled = ExtResource("2_0k8lk")
CheckBox/styles/disabled = SubResource("StyleBoxFlat_lbyuh") CheckBox/styles/disabled = SubResource("StyleBoxFlat_lbyuh")
CheckBox/styles/focus = SubResource("StyleBoxFlat_4dymj") CheckBox/styles/focus = SubResource("StyleBoxFlat_4dymj")
CheckBox/styles/hover = SubResource("StyleBoxFlat_4jbvl") CheckBox/styles/hover = SubResource("StyleBoxFlat_4jbvl")
@ -710,7 +782,7 @@ CheckButton/styles/hover_pressed = SubResource("StyleBoxFlat_viauy")
CheckButton/styles/normal = SubResource("StyleBoxFlat_ygru1") CheckButton/styles/normal = SubResource("StyleBoxFlat_ygru1")
CheckButton/styles/pressed = SubResource("StyleBoxFlat_h750t") CheckButton/styles/pressed = SubResource("StyleBoxFlat_h750t")
CollapsibleContainer/base_type = &"VBoxContainer" CollapsibleContainer/base_type = &"VBoxContainer"
CollapsibleContainer/icons/arrow_normal = ExtResource("3_xwrfs") CollapsibleContainer/icons/arrow_normal = ExtResource("3_rog17")
ColorPicker/constants/h_width = 28 ColorPicker/constants/h_width = 28
ColorPicker/constants/margin = 8 ColorPicker/constants/margin = 8
ColorPickerButton/styles/disabled = null ColorPickerButton/styles/disabled = null
@ -745,6 +817,8 @@ ItemList/styles/selected = SubResource("95")
ItemList/styles/selected_focus = SubResource("96") ItemList/styles/selected_focus = SubResource("96")
Label/colors/font_color = Color(0.776471, 0.776471, 0.776471, 1) Label/colors/font_color = Color(0.776471, 0.776471, 0.776471, 1)
Label/styles/normal = SubResource("StyleBoxEmpty_u871w") Label/styles/normal = SubResource("StyleBoxEmpty_u871w")
LayerFrameButton/base_type = &"CelButton"
LayerFrameButton/styles/pressed = SubResource("StyleBoxFlat_o72qi")
LineEdit/colors/clear_button_color = Color(0.77832, 0.77832, 0.77832, 1) LineEdit/colors/clear_button_color = Color(0.77832, 0.77832, 0.77832, 1)
LineEdit/colors/clear_button_color_pressed = Color(0.184314, 0.396078, 0.533333, 1) LineEdit/colors/clear_button_color_pressed = Color(0.184314, 0.396078, 0.533333, 1)
LineEdit/colors/font_color = Color(0.776471, 0.776471, 0.776471, 1) LineEdit/colors/font_color = Color(0.776471, 0.776471, 0.776471, 1)
@ -774,10 +848,10 @@ Panel/styles/panel = SubResource("103")
PanelContainer/styles/panel = SubResource("104") PanelContainer/styles/panel = SubResource("104")
PopupMenu/colors/font_color = Color(0.776471, 0.776471, 0.776471, 1) PopupMenu/colors/font_color = Color(0.776471, 0.776471, 0.776471, 1)
PopupMenu/colors/font_disabled_color = Color(0.776471, 0.776471, 0.776471, 0.5) PopupMenu/colors/font_disabled_color = Color(0.776471, 0.776471, 0.776471, 0.5)
PopupMenu/icons/radio_unchecked = ExtResource("1_d5k4r") PopupMenu/icons/radio_unchecked = ExtResource("1_tb0vl")
PopupMenu/icons/radio_unchecked_disabled = ExtResource("1_d5k4r") PopupMenu/icons/radio_unchecked_disabled = ExtResource("1_tb0vl")
PopupMenu/icons/unchecked = ExtResource("2_g65j0") PopupMenu/icons/unchecked = ExtResource("2_0k8lk")
PopupMenu/icons/unchecked_disabled = ExtResource("2_g65j0") PopupMenu/icons/unchecked_disabled = ExtResource("2_0k8lk")
PopupMenu/styles/hover = SubResource("112") PopupMenu/styles/hover = SubResource("112")
PopupMenu/styles/labeled_separator_left = SubResource("113") PopupMenu/styles/labeled_separator_left = SubResource("113")
PopupMenu/styles/labeled_separator_right = SubResource("114") PopupMenu/styles/labeled_separator_right = SubResource("114")
@ -833,7 +907,7 @@ Tree/colors/guide_color = Color(1, 1, 1, 0.05)
Tree/colors/relationship_line_color = Color(1, 1, 1, 0.1) Tree/colors/relationship_line_color = Color(1, 1, 1, 0.1)
Tree/colors/title_button_color = Color(0.77832, 0.77832, 0.77832, 1) Tree/colors/title_button_color = Color(0.77832, 0.77832, 0.77832, 1)
Tree/constants/scroll_border = 40 Tree/constants/scroll_border = 40
Tree/icons/unchecked = ExtResource("2_g65j0") Tree/icons/unchecked = ExtResource("2_0k8lk")
Tree/styles/button_pressed = SubResource("156") Tree/styles/button_pressed = SubResource("156")
Tree/styles/cursor = SubResource("157") Tree/styles/cursor = SubResource("157")
Tree/styles/cursor_unfocused = SubResource("157") Tree/styles/cursor_unfocused = SubResource("157")
@ -859,12 +933,12 @@ VSplitContainer/constants/separation = 8
ValueSlider/base_type = &"TextureProgressBar" ValueSlider/base_type = &"TextureProgressBar"
ValueSlider/colors/progress_color = Color(0.231373, 0.231373, 0.231373, 1) ValueSlider/colors/progress_color = Color(0.231373, 0.231373, 0.231373, 1)
ValueSlider/colors/under_color = Color(0.0901961, 0.0901961, 0.0901961, 1) ValueSlider/colors/under_color = Color(0.0901961, 0.0901961, 0.0901961, 1)
ValueSlider/icons/arrow_hover = ExtResource("4_upj71") ValueSlider/icons/arrow_hover = ExtResource("4_ek41l")
ValueSlider/icons/arrow_normal = ExtResource("3_xwrfs") ValueSlider/icons/arrow_normal = ExtResource("3_rog17")
ValueSlider/icons/arrow_pressed = ExtResource("5_wrq0c") ValueSlider/icons/arrow_pressed = ExtResource("5_x3r05")
ValueSlider/icons/texture_over = null ValueSlider/icons/texture_over = null
ValueSlider/icons/texture_progress = ExtResource("6_4cw4d") ValueSlider/icons/texture_progress = ExtResource("6_p4erc")
ValueSlider/icons/texture_under = ExtResource("6_4cw4d") ValueSlider/icons/texture_under = ExtResource("6_p4erc")
Window/colors/title_color = Color(0.776471, 0.776471, 0.776471, 1) Window/colors/title_color = Color(0.776471, 0.776471, 0.776471, 1)
Window/constants/title_height = 24 Window/constants/title_height = 24
Window/styles/embedded_border = SubResource("StyleBoxFlat_pgljm") Window/styles/embedded_border = SubResource("StyleBoxFlat_pgljm")

2
src/Classes/AnimationTag.gd
View file

@ -43,7 +43,7 @@ extends RefCounted
## Global.current_project.undo_redo.commit_action() ## Global.current_project.undo_redo.commit_action()
## [/codeblock] ## [/codeblock]
const CEL_SEPARATION := 4 const CEL_SEPARATION := 0
var name: String ## Name of tag var name: String ## Name of tag
var color: Color ## Color of tag var color: Color ## Color of tag

2
src/Main.tscn
View file

@ -1,6 +1,6 @@
[gd_scene load_steps=20 format=3 uid="uid://dbylw5k04ulp8"] [gd_scene load_steps=20 format=3 uid="uid://dbylw5k04ulp8"]
[ext_resource type="Theme" uid="uid://bka2dkyhkqpmq" path="res://assets/themes/dark/theme.tres" id="1"] [ext_resource type="Theme" uid="uid://d6j8rvqw7ekv" path="res://assets/themes/dark/theme.tres" id="1"]
[ext_resource type="Script" path="res://src/Main.gd" id="2"] [ext_resource type="Script" path="res://src/Main.gd" id="2"]
[ext_resource type="PackedScene" uid="uid://bsgwar3l6qtgv" path="res://src/UI/TopMenuContainer/TopMenuContainer.tscn" id="3"] [ext_resource type="PackedScene" uid="uid://bsgwar3l6qtgv" path="res://src/UI/TopMenuContainer/TopMenuContainer.tscn" id="3"]
[ext_resource type="PackedScene" uid="uid://c8dsi6ggkqa7a" path="res://src/UI/UI.tscn" id="4"] [ext_resource type="PackedScene" uid="uid://c8dsi6ggkqa7a" path="res://src/UI/UI.tscn" id="4"]

1
src/UI/Timeline/AnimationTimeline.gd
View file

@ -1130,6 +1130,7 @@ func project_layer_added(layer: int) -> void:
project.layers[layer].set_name_to_default(Global.current_project.layers.size()) project.layers[layer].set_name_to_default(Global.current_project.layers.size())
var cel_hbox := HBoxContainer.new() var cel_hbox := HBoxContainer.new()
cel_hbox.add_theme_constant_override("separation", 0)
for f in project.frames.size(): for f in project.frames.size():
var cel_button := project.frames[f].cels[layer].instantiate_cel_button() var cel_button := project.frames[f].cels[layer].instantiate_cel_button()
cel_button.frame = f cel_button.frame = f

127
src/UI/Timeline/AnimationTimeline.tscn
View file

@ -1,4 +1,4 @@
[gd_scene load_steps=77 format=3 uid="uid://dbr6mulku2qju"] [gd_scene load_steps=78 format=3 uid="uid://dbr6mulku2qju"]
[ext_resource type="Script" path="res://src/UI/Timeline/AnimationTimeline.gd" id="1"] [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"] [ext_resource type="Texture2D" uid="uid://d36mlbmq06q4e" path="res://assets/graphics/layers/new.png" id="2"]
@ -176,6 +176,8 @@ HScrollBar/styles/grabber_pressed = SubResource("17")
HScrollBar/styles/scroll = SubResource("18") HScrollBar/styles/scroll = SubResource("18")
HScrollBar/styles/scroll_focus = SubResource("19") HScrollBar/styles/scroll_focus = SubResource("19")
[sub_resource type="ImageTexture" id="ImageTexture_ku1qg"]
[node name="AnimationTimeline" type="Panel"] [node name="AnimationTimeline" type="Panel"]
clip_contents = true clip_contents = true
offset_right = 902.0 offset_right = 902.0
@ -183,9 +185,12 @@ offset_bottom = 160.0
script = ExtResource("1") script = ExtResource("1")
[node name="TimelineContainer" type="VBoxContainer" parent="."] [node name="TimelineContainer" type="VBoxContainer" parent="."]
layout_mode = 0 layout_mode = 1
anchors_preset = 15
anchor_right = 1.0 anchor_right = 1.0
anchor_bottom = 1.0 anchor_bottom = 1.0
grow_horizontal = 2
grow_vertical = 2
[node name="TimelineButtons" type="HBoxContainer" parent="TimelineContainer"] [node name="TimelineButtons" type="HBoxContainer" parent="TimelineContainer"]
layout_mode = 2 layout_mode = 2
@ -193,15 +198,18 @@ layout_mode = 2
[node name="LayerTools" type="PanelContainer" parent="TimelineContainer/TimelineButtons"] [node name="LayerTools" type="PanelContainer" parent="TimelineContainer/TimelineButtons"]
layout_mode = 2 layout_mode = 2
[node name="LayerSettingsContainer" type="VBoxContainer" parent="TimelineContainer/TimelineButtons/LayerTools"] [node name="MarginContainer" type="MarginContainer" parent="TimelineContainer/TimelineButtons/LayerTools"]
layout_mode = 2
[node name="LayerSettingsContainer" type="VBoxContainer" parent="TimelineContainer/TimelineButtons/LayerTools/MarginContainer"]
unique_name_in_owner = true unique_name_in_owner = true
layout_mode = 2 layout_mode = 2
[node name="LayerButtons" type="HBoxContainer" parent="TimelineContainer/TimelineButtons/LayerTools/LayerSettingsContainer"] [node name="LayerButtons" type="HBoxContainer" parent="TimelineContainer/TimelineButtons/LayerTools/MarginContainer/LayerSettingsContainer"]
layout_mode = 2 layout_mode = 2
theme_override_constants/separation = 9 theme_override_constants/separation = 9
[node name="AddLayer" type="Button" parent="TimelineContainer/TimelineButtons/LayerTools/LayerSettingsContainer/LayerButtons" groups=["UIButtons"]] [node name="AddLayer" type="Button" parent="TimelineContainer/TimelineButtons/LayerTools/MarginContainer/LayerSettingsContainer/LayerButtons" groups=["UIButtons"]]
custom_minimum_size = Vector2(44, 24) custom_minimum_size = Vector2(44, 24)
layout_mode = 2 layout_mode = 2
size_flags_horizontal = 3 size_flags_horizontal = 3
@ -211,7 +219,7 @@ focus_mode = 0
mouse_default_cursor_shape = 2 mouse_default_cursor_shape = 2
shortcut = SubResource("Shortcut_tpvn2") shortcut = SubResource("Shortcut_tpvn2")
[node name="TextureRect" type="TextureRect" parent="TimelineContainer/TimelineButtons/LayerTools/LayerSettingsContainer/LayerButtons/AddLayer"] [node name="TextureRect" type="TextureRect" parent="TimelineContainer/TimelineButtons/LayerTools/MarginContainer/LayerSettingsContainer/LayerButtons/AddLayer"]
layout_mode = 1 layout_mode = 1
anchors_preset = 4 anchors_preset = 4
anchor_top = 0.5 anchor_top = 0.5
@ -225,7 +233,7 @@ size_flags_vertical = 0
texture = ExtResource("2") texture = ExtResource("2")
stretch_mode = 3 stretch_mode = 3
[node name="AddLayerList" type="MenuButton" parent="TimelineContainer/TimelineButtons/LayerTools/LayerSettingsContainer/LayerButtons/AddLayer"] [node name="AddLayerList" type="MenuButton" parent="TimelineContainer/TimelineButtons/LayerTools/MarginContainer/LayerSettingsContainer/LayerButtons/AddLayer"]
unique_name_in_owner = true unique_name_in_owner = true
custom_minimum_size = Vector2(22, 0) custom_minimum_size = Vector2(22, 0)
layout_mode = 0 layout_mode = 0
@ -245,7 +253,7 @@ popup/item_1/id = 1
popup/item_2/text = "Add 3D Layer" popup/item_2/text = "Add 3D Layer"
popup/item_2/id = 2 popup/item_2/id = 2
[node name="TextureRect" type="TextureRect" parent="TimelineContainer/TimelineButtons/LayerTools/LayerSettingsContainer/LayerButtons/AddLayer/AddLayerList"] [node name="TextureRect" type="TextureRect" parent="TimelineContainer/TimelineButtons/LayerTools/MarginContainer/LayerSettingsContainer/LayerButtons/AddLayer/AddLayerList"]
layout_mode = 0 layout_mode = 0
anchor_left = 0.5 anchor_left = 0.5
anchor_top = 0.5 anchor_top = 0.5
@ -257,7 +265,7 @@ offset_right = 6.0
offset_bottom = 6.0 offset_bottom = 6.0
texture = ExtResource("10") texture = ExtResource("10")
[node name="RemoveLayer" type="Button" parent="TimelineContainer/TimelineButtons/LayerTools/LayerSettingsContainer/LayerButtons" groups=["UIButtons"]] [node name="RemoveLayer" type="Button" parent="TimelineContainer/TimelineButtons/LayerTools/MarginContainer/LayerSettingsContainer/LayerButtons" groups=["UIButtons"]]
unique_name_in_owner = true unique_name_in_owner = true
custom_minimum_size = Vector2(24, 24) custom_minimum_size = Vector2(24, 24)
layout_mode = 2 layout_mode = 2
@ -269,7 +277,7 @@ mouse_default_cursor_shape = 8
disabled = true disabled = true
shortcut = SubResource("Shortcut_xar00") shortcut = SubResource("Shortcut_xar00")
[node name="TextureRect" type="TextureRect" parent="TimelineContainer/TimelineButtons/LayerTools/LayerSettingsContainer/LayerButtons/RemoveLayer"] [node name="TextureRect" type="TextureRect" parent="TimelineContainer/TimelineButtons/LayerTools/MarginContainer/LayerSettingsContainer/LayerButtons/RemoveLayer"]
layout_mode = 1 layout_mode = 1
anchors_preset = 15 anchors_preset = 15
anchor_right = 1.0 anchor_right = 1.0
@ -281,7 +289,7 @@ size_flags_vertical = 0
texture = ExtResource("6") texture = ExtResource("6")
stretch_mode = 3 stretch_mode = 3
[node name="MoveUpLayer" type="Button" parent="TimelineContainer/TimelineButtons/LayerTools/LayerSettingsContainer/LayerButtons" groups=["UIButtons"]] [node name="MoveUpLayer" type="Button" parent="TimelineContainer/TimelineButtons/LayerTools/MarginContainer/LayerSettingsContainer/LayerButtons" groups=["UIButtons"]]
unique_name_in_owner = true unique_name_in_owner = true
custom_minimum_size = Vector2(24, 24) custom_minimum_size = Vector2(24, 24)
layout_mode = 2 layout_mode = 2
@ -293,7 +301,7 @@ mouse_default_cursor_shape = 8
disabled = true disabled = true
shortcut = SubResource("Shortcut_r300c") shortcut = SubResource("Shortcut_r300c")
[node name="TextureRect" type="TextureRect" parent="TimelineContainer/TimelineButtons/LayerTools/LayerSettingsContainer/LayerButtons/MoveUpLayer"] [node name="TextureRect" type="TextureRect" parent="TimelineContainer/TimelineButtons/LayerTools/MarginContainer/LayerSettingsContainer/LayerButtons/MoveUpLayer"]
layout_mode = 1 layout_mode = 1
anchors_preset = 15 anchors_preset = 15
anchor_right = 1.0 anchor_right = 1.0
@ -305,7 +313,7 @@ size_flags_vertical = 0
texture = ExtResource("4") texture = ExtResource("4")
stretch_mode = 3 stretch_mode = 3
[node name="MoveDownLayer" type="Button" parent="TimelineContainer/TimelineButtons/LayerTools/LayerSettingsContainer/LayerButtons" groups=["UIButtons"]] [node name="MoveDownLayer" type="Button" parent="TimelineContainer/TimelineButtons/LayerTools/MarginContainer/LayerSettingsContainer/LayerButtons" groups=["UIButtons"]]
unique_name_in_owner = true unique_name_in_owner = true
custom_minimum_size = Vector2(24, 24) custom_minimum_size = Vector2(24, 24)
layout_mode = 2 layout_mode = 2
@ -317,7 +325,7 @@ mouse_default_cursor_shape = 8
disabled = true disabled = true
shortcut = SubResource("Shortcut_763li") shortcut = SubResource("Shortcut_763li")
[node name="TextureRect" type="TextureRect" parent="TimelineContainer/TimelineButtons/LayerTools/LayerSettingsContainer/LayerButtons/MoveDownLayer"] [node name="TextureRect" type="TextureRect" parent="TimelineContainer/TimelineButtons/LayerTools/MarginContainer/LayerSettingsContainer/LayerButtons/MoveDownLayer"]
layout_mode = 1 layout_mode = 1
anchors_preset = 15 anchors_preset = 15
anchor_right = 1.0 anchor_right = 1.0
@ -329,7 +337,7 @@ size_flags_vertical = 0
texture = ExtResource("3") texture = ExtResource("3")
stretch_mode = 3 stretch_mode = 3
[node name="CloneLayer" type="Button" parent="TimelineContainer/TimelineButtons/LayerTools/LayerSettingsContainer/LayerButtons" groups=["UIButtons"]] [node name="CloneLayer" type="Button" parent="TimelineContainer/TimelineButtons/LayerTools/MarginContainer/LayerSettingsContainer/LayerButtons" groups=["UIButtons"]]
custom_minimum_size = Vector2(24, 24) custom_minimum_size = Vector2(24, 24)
layout_mode = 2 layout_mode = 2
size_flags_horizontal = 3 size_flags_horizontal = 3
@ -339,7 +347,7 @@ focus_mode = 0
mouse_default_cursor_shape = 2 mouse_default_cursor_shape = 2
shortcut = SubResource("Shortcut_0o4ap") shortcut = SubResource("Shortcut_0o4ap")
[node name="TextureRect" type="TextureRect" parent="TimelineContainer/TimelineButtons/LayerTools/LayerSettingsContainer/LayerButtons/CloneLayer"] [node name="TextureRect" type="TextureRect" parent="TimelineContainer/TimelineButtons/LayerTools/MarginContainer/LayerSettingsContainer/LayerButtons/CloneLayer"]
layout_mode = 1 layout_mode = 1
anchors_preset = 15 anchors_preset = 15
anchor_right = 1.0 anchor_right = 1.0
@ -351,7 +359,7 @@ size_flags_vertical = 0
texture = ExtResource("7") texture = ExtResource("7")
stretch_mode = 3 stretch_mode = 3
[node name="MergeDownLayer" type="Button" parent="TimelineContainer/TimelineButtons/LayerTools/LayerSettingsContainer/LayerButtons" groups=["UIButtons"]] [node name="MergeDownLayer" type="Button" parent="TimelineContainer/TimelineButtons/LayerTools/MarginContainer/LayerSettingsContainer/LayerButtons" groups=["UIButtons"]]
unique_name_in_owner = true unique_name_in_owner = true
custom_minimum_size = Vector2(24, 24) custom_minimum_size = Vector2(24, 24)
layout_mode = 2 layout_mode = 2
@ -363,7 +371,7 @@ mouse_default_cursor_shape = 8
disabled = true disabled = true
shortcut = SubResource("Shortcut_wbf7k") shortcut = SubResource("Shortcut_wbf7k")
[node name="TextureRect" type="TextureRect" parent="TimelineContainer/TimelineButtons/LayerTools/LayerSettingsContainer/LayerButtons/MergeDownLayer"] [node name="TextureRect" type="TextureRect" parent="TimelineContainer/TimelineButtons/LayerTools/MarginContainer/LayerSettingsContainer/LayerButtons/MergeDownLayer"]
layout_mode = 1 layout_mode = 1
anchors_preset = 15 anchors_preset = 15
anchor_right = 1.0 anchor_right = 1.0
@ -375,13 +383,13 @@ size_flags_vertical = 0
texture = ExtResource("5") texture = ExtResource("5")
stretch_mode = 3 stretch_mode = 3
[node name="LayerFX" type="Button" parent="TimelineContainer/TimelineButtons/LayerTools/LayerSettingsContainer/LayerButtons" groups=["UIButtons"]] [node name="LayerFX" type="Button" parent="TimelineContainer/TimelineButtons/LayerTools/MarginContainer/LayerSettingsContainer/LayerButtons" groups=["UIButtons"]]
custom_minimum_size = Vector2(24, 24) custom_minimum_size = Vector2(24, 24)
layout_mode = 2 layout_mode = 2
size_flags_vertical = 4 size_flags_vertical = 4
mouse_default_cursor_shape = 2 mouse_default_cursor_shape = 2
[node name="TextureRect" type="TextureRect" parent="TimelineContainer/TimelineButtons/LayerTools/LayerSettingsContainer/LayerButtons/LayerFX"] [node name="TextureRect" type="TextureRect" parent="TimelineContainer/TimelineButtons/LayerTools/MarginContainer/LayerSettingsContainer/LayerButtons/LayerFX"]
layout_mode = 1 layout_mode = 1
anchors_preset = 15 anchors_preset = 15
anchor_right = 1.0 anchor_right = 1.0
@ -393,14 +401,14 @@ size_flags_vertical = 0
texture = ExtResource("9_yphnd") texture = ExtResource("9_yphnd")
stretch_mode = 3 stretch_mode = 3
[node name="BlendContainer" type="HBoxContainer" parent="TimelineContainer/TimelineButtons/LayerTools/LayerSettingsContainer"] [node name="BlendContainer" type="HBoxContainer" parent="TimelineContainer/TimelineButtons/LayerTools/MarginContainer/LayerSettingsContainer"]
layout_mode = 2 layout_mode = 2
[node name="BlendModeLabel" type="Label" parent="TimelineContainer/TimelineButtons/LayerTools/LayerSettingsContainer/BlendContainer"] [node name="BlendModeLabel" type="Label" parent="TimelineContainer/TimelineButtons/LayerTools/MarginContainer/LayerSettingsContainer/BlendContainer"]
layout_mode = 2 layout_mode = 2
text = "Blend mode:" text = "Blend mode:"
[node name="BlendModes" type="OptionButton" parent="TimelineContainer/TimelineButtons/LayerTools/LayerSettingsContainer/BlendContainer"] [node name="BlendModes" type="OptionButton" parent="TimelineContainer/TimelineButtons/LayerTools/MarginContainer/LayerSettingsContainer/BlendContainer"]
unique_name_in_owner = true unique_name_in_owner = true
layout_mode = 2 layout_mode = 2
size_flags_horizontal = 3 size_flags_horizontal = 3
@ -809,43 +817,72 @@ size_flags_horizontal = 3
layout_mode = 2 layout_mode = 2
size_flags_vertical = 3 size_flags_vertical = 3
[node name="LayerFrameHSplit" type="HSplitContainer" parent="TimelineContainer/MainBodyPanel/MainBodyVBoxContainer/TimelineScroll"] [node name="MarginContainer" type="MarginContainer" parent="TimelineContainer/MainBodyPanel/MainBodyVBoxContainer/TimelineScroll"]
unique_name_in_owner = true
layout_mode = 2 layout_mode = 2
size_flags_horizontal = 3 size_flags_horizontal = 3
size_flags_vertical = 3 size_flags_vertical = 3
[node name="LayerContainer" type="VBoxContainer" parent="TimelineContainer/MainBodyPanel/MainBodyVBoxContainer/TimelineScroll/LayerFrameHSplit"] [node name="LayerFrameHSplit" type="HSplitContainer" parent="TimelineContainer/MainBodyPanel/MainBodyVBoxContainer/TimelineScroll/MarginContainer"]
unique_name_in_owner = true unique_name_in_owner = true
layout_mode = 2 layout_mode = 2
size_flags_horizontal = 3
size_flags_vertical = 3
theme_override_constants/separation = 0
theme_override_constants/minimum_grab_thickness = 12
theme_override_icons/grabber = SubResource("ImageTexture_ku1qg")
[node name="OpacitySlider" parent="TimelineContainer/MainBodyPanel/MainBodyVBoxContainer/TimelineScroll/LayerFrameHSplit/LayerContainer" instance=ExtResource("9")] [node name="LayerContainer" type="VBoxContainer" parent="TimelineContainer/MainBodyPanel/MainBodyVBoxContainer/TimelineScroll/MarginContainer/LayerFrameHSplit"]
unique_name_in_owner = true unique_name_in_owner = true
custom_minimum_size = Vector2(207, 30) layout_mode = 2
theme_override_constants/separation = 1
[node name="MarginContainer" type="MarginContainer" parent="TimelineContainer/MainBodyPanel/MainBodyVBoxContainer/TimelineScroll/MarginContainer/LayerFrameHSplit/LayerContainer"]
editor_description = "Its entire purpose is to add a single pixel on the right of the opacity slider"
layout_mode = 2
theme_override_constants/margin_left = 0
theme_override_constants/margin_top = 2
theme_override_constants/margin_right = 1
theme_override_constants/margin_bottom = 0
[node name="OpacitySlider" parent="TimelineContainer/MainBodyPanel/MainBodyVBoxContainer/TimelineScroll/MarginContainer/LayerFrameHSplit/LayerContainer/MarginContainer" instance=ExtResource("9")]
unique_name_in_owner = true
custom_minimum_size = Vector2(0, 29)
layout_mode = 2 layout_mode = 2
size_flags_vertical = 0 size_flags_vertical = 0
value = 100.0 value = 100.0
prefix = "Opacity:" prefix = "Opacity:"
[node name="LayerVBox" type="VBoxContainer" parent="TimelineContainer/MainBodyPanel/MainBodyVBoxContainer/TimelineScroll/LayerFrameHSplit/LayerContainer"] [node name="LayerVBox" type="VBoxContainer" parent="TimelineContainer/MainBodyPanel/MainBodyVBoxContainer/TimelineScroll/MarginContainer/LayerFrameHSplit/LayerContainer"]
layout_mode = 2 layout_mode = 2
size_flags_horizontal = 3 size_flags_horizontal = 3
theme_override_constants/separation = 0
[node name="FrameScrollContainer" type="Container" parent="TimelineContainer/MainBodyPanel/MainBodyVBoxContainer/TimelineScroll/LayerFrameHSplit"] [node name="FrameScrollContainer" type="Container" parent="TimelineContainer/MainBodyPanel/MainBodyVBoxContainer/TimelineScroll/MarginContainer/LayerFrameHSplit" node_paths=PackedStringArray("h_scroll_bar")]
unique_name_in_owner = true unique_name_in_owner = true
clip_contents = true
layout_mode = 2 layout_mode = 2
script = ExtResource("11") script = ExtResource("11")
h_scroll_bar_node_path = NodePath("../../../BreakFreeFromContainer/FrameScrollBar") h_scroll_bar = NodePath("../../../../BreakFreeFromContainer/FrameScrollBar")
[node name="FrameAndCelBox" type="VBoxContainer" parent="TimelineContainer/MainBodyPanel/MainBodyVBoxContainer/TimelineScroll/LayerFrameHSplit/FrameScrollContainer"] [node name="MarginContainer" type="MarginContainer" parent="TimelineContainer/MainBodyPanel/MainBodyVBoxContainer/TimelineScroll/MarginContainer/LayerFrameHSplit/FrameScrollContainer"]
layout_mode = 2 layout_mode = 2
theme_override_constants/margin_left = 0
theme_override_constants/margin_top = 2
theme_override_constants/margin_right = 0
theme_override_constants/margin_bottom = 0
[node name="FrameHBox" type="HBoxContainer" parent="TimelineContainer/MainBodyPanel/MainBodyVBoxContainer/TimelineScroll/LayerFrameHSplit/FrameScrollContainer/FrameAndCelBox"] [node name="FrameAndCelBox" type="VBoxContainer" parent="TimelineContainer/MainBodyPanel/MainBodyVBoxContainer/TimelineScroll/MarginContainer/LayerFrameHSplit/FrameScrollContainer/MarginContainer"]
layout_mode = 2
theme_override_constants/separation = 0
[node name="FrameHBox" type="HBoxContainer" parent="TimelineContainer/MainBodyPanel/MainBodyVBoxContainer/TimelineScroll/MarginContainer/LayerFrameHSplit/FrameScrollContainer/MarginContainer/FrameAndCelBox"]
custom_minimum_size = Vector2(0, 30) custom_minimum_size = Vector2(0, 30)
layout_mode = 2 layout_mode = 2
theme_override_constants/separation = 0
[node name="CelVBox" type="VBoxContainer" parent="TimelineContainer/MainBodyPanel/MainBodyVBoxContainer/TimelineScroll/LayerFrameHSplit/FrameScrollContainer/FrameAndCelBox"] [node name="CelVBox" type="VBoxContainer" parent="TimelineContainer/MainBodyPanel/MainBodyVBoxContainer/TimelineScroll/MarginContainer/LayerFrameHSplit/FrameScrollContainer/MarginContainer/FrameAndCelBox"]
layout_mode = 2 layout_mode = 2
theme_override_constants/separation = 0
[node name="BreakFreeFromContainer" type="Control" parent="TimelineContainer/MainBodyPanel/MainBodyVBoxContainer"] [node name="BreakFreeFromContainer" type="Control" parent="TimelineContainer/MainBodyPanel/MainBodyVBoxContainer"]
layout_mode = 2 layout_mode = 2
@ -1010,14 +1047,14 @@ layout_mode = 2
horizontal_alignment = 1 horizontal_alignment = 1
autowrap_mode = 3 autowrap_mode = 3
[connection signal="pressed" from="TimelineContainer/TimelineButtons/LayerTools/LayerSettingsContainer/LayerButtons/AddLayer" to="." method="add_layer"] [connection signal="pressed" from="TimelineContainer/TimelineButtons/LayerTools/MarginContainer/LayerSettingsContainer/LayerButtons/AddLayer" to="." method="add_layer"]
[connection signal="pressed" from="TimelineContainer/TimelineButtons/LayerTools/LayerSettingsContainer/LayerButtons/RemoveLayer" to="." method="_on_RemoveLayer_pressed"] [connection signal="pressed" from="TimelineContainer/TimelineButtons/LayerTools/MarginContainer/LayerSettingsContainer/LayerButtons/RemoveLayer" to="." method="_on_RemoveLayer_pressed"]
[connection signal="pressed" from="TimelineContainer/TimelineButtons/LayerTools/LayerSettingsContainer/LayerButtons/MoveUpLayer" to="." method="change_layer_order" binds= [true]] [connection signal="pressed" from="TimelineContainer/TimelineButtons/LayerTools/MarginContainer/LayerSettingsContainer/LayerButtons/MoveUpLayer" to="." method="change_layer_order" binds= [true]]
[connection signal="pressed" from="TimelineContainer/TimelineButtons/LayerTools/LayerSettingsContainer/LayerButtons/MoveDownLayer" to="." method="change_layer_order" binds= [false]] [connection signal="pressed" from="TimelineContainer/TimelineButtons/LayerTools/MarginContainer/LayerSettingsContainer/LayerButtons/MoveDownLayer" to="." method="change_layer_order" binds= [false]]
[connection signal="pressed" from="TimelineContainer/TimelineButtons/LayerTools/LayerSettingsContainer/LayerButtons/CloneLayer" to="." method="_on_CloneLayer_pressed"] [connection signal="pressed" from="TimelineContainer/TimelineButtons/LayerTools/MarginContainer/LayerSettingsContainer/LayerButtons/CloneLayer" to="." method="_on_CloneLayer_pressed"]
[connection signal="pressed" from="TimelineContainer/TimelineButtons/LayerTools/LayerSettingsContainer/LayerButtons/MergeDownLayer" to="." method="_on_MergeDownLayer_pressed"] [connection signal="pressed" from="TimelineContainer/TimelineButtons/LayerTools/MarginContainer/LayerSettingsContainer/LayerButtons/MergeDownLayer" to="." method="_on_MergeDownLayer_pressed"]
[connection signal="pressed" from="TimelineContainer/TimelineButtons/LayerTools/LayerSettingsContainer/LayerButtons/LayerFX" to="." method="_on_layer_fx_pressed"] [connection signal="pressed" from="TimelineContainer/TimelineButtons/LayerTools/MarginContainer/LayerSettingsContainer/LayerButtons/LayerFX" to="." method="_on_layer_fx_pressed"]
[connection signal="item_selected" from="TimelineContainer/TimelineButtons/LayerTools/LayerSettingsContainer/BlendContainer/BlendModes" to="." method="_on_blend_modes_item_selected"] [connection signal="item_selected" from="TimelineContainer/TimelineButtons/LayerTools/MarginContainer/LayerSettingsContainer/BlendContainer/BlendModes" to="." method="_on_blend_modes_item_selected"]
[connection signal="pressed" from="TimelineContainer/TimelineButtons/VBoxContainer/AnimationToolsScrollContainer/AnimationTools/AnimationButtons/FrameButtons/AddFrame" to="." method="add_frame"] [connection signal="pressed" from="TimelineContainer/TimelineButtons/VBoxContainer/AnimationToolsScrollContainer/AnimationTools/AnimationButtons/FrameButtons/AddFrame" to="." method="add_frame"]
[connection signal="pressed" from="TimelineContainer/TimelineButtons/VBoxContainer/AnimationToolsScrollContainer/AnimationTools/AnimationButtons/FrameButtons/DeleteFrame" to="." method="_on_DeleteFrame_pressed"] [connection signal="pressed" from="TimelineContainer/TimelineButtons/VBoxContainer/AnimationToolsScrollContainer/AnimationTools/AnimationButtons/FrameButtons/DeleteFrame" to="." method="_on_DeleteFrame_pressed"]
[connection signal="pressed" from="TimelineContainer/TimelineButtons/VBoxContainer/AnimationToolsScrollContainer/AnimationTools/AnimationButtons/FrameButtons/CopyFrame" to="." method="_on_CopyFrame_pressed"] [connection signal="pressed" from="TimelineContainer/TimelineButtons/VBoxContainer/AnimationToolsScrollContainer/AnimationTools/AnimationButtons/FrameButtons/CopyFrame" to="." method="_on_CopyFrame_pressed"]
@ -1034,9 +1071,9 @@ autowrap_mode = 3
[connection signal="pressed" from="TimelineContainer/TimelineButtons/VBoxContainer/AnimationToolsScrollContainer/AnimationTools/AnimationButtons/LoopButtons/OnionSkinning" to="." method="_on_OnionSkinning_pressed"] [connection signal="pressed" from="TimelineContainer/TimelineButtons/VBoxContainer/AnimationToolsScrollContainer/AnimationTools/AnimationButtons/LoopButtons/OnionSkinning" to="." method="_on_OnionSkinning_pressed"]
[connection signal="pressed" from="TimelineContainer/TimelineButtons/VBoxContainer/AnimationToolsScrollContainer/AnimationTools/AnimationButtons/LoopButtons/LoopAnim" to="." method="_on_LoopAnim_pressed"] [connection signal="pressed" from="TimelineContainer/TimelineButtons/VBoxContainer/AnimationToolsScrollContainer/AnimationTools/AnimationButtons/LoopButtons/LoopAnim" to="." method="_on_LoopAnim_pressed"]
[connection signal="value_changed" from="TimelineContainer/TimelineButtons/VBoxContainer/AnimationToolsScrollContainer/AnimationTools/AnimationButtons/LoopButtons/FPSValue" to="." method="_on_FPSValue_value_changed"] [connection signal="value_changed" from="TimelineContainer/TimelineButtons/VBoxContainer/AnimationToolsScrollContainer/AnimationTools/AnimationButtons/LoopButtons/FPSValue" to="." method="_on_FPSValue_value_changed"]
[connection signal="gui_input" from="TimelineContainer/MainBodyPanel/MainBodyVBoxContainer/TimelineScroll/LayerFrameHSplit" to="." method="_on_LayerFrameSplitContainer_gui_input"] [connection signal="gui_input" from="TimelineContainer/MainBodyPanel/MainBodyVBoxContainer/TimelineScroll/MarginContainer/LayerFrameHSplit" to="." method="_on_LayerFrameSplitContainer_gui_input"]
[connection signal="value_changed" from="TimelineContainer/MainBodyPanel/MainBodyVBoxContainer/TimelineScroll/LayerFrameHSplit/LayerContainer/OpacitySlider" to="." method="_on_OpacitySlider_value_changed"] [connection signal="value_changed" from="TimelineContainer/MainBodyPanel/MainBodyVBoxContainer/TimelineScroll/MarginContainer/LayerFrameHSplit/LayerContainer/MarginContainer/OpacitySlider" to="." method="_on_OpacitySlider_value_changed"]
[connection signal="resized" from="TimelineContainer/MainBodyPanel/MainBodyVBoxContainer/TimelineScroll/LayerFrameHSplit/LayerContainer/LayerVBox" to="." method="_on_LayerVBox_resized"] [connection signal="resized" from="TimelineContainer/MainBodyPanel/MainBodyVBoxContainer/TimelineScroll/MarginContainer/LayerFrameHSplit/LayerContainer/LayerVBox" to="." method="_on_LayerVBox_resized"]
[connection signal="timeout" from="AnimationTimer" to="." method="_on_AnimationTimer_timeout"] [connection signal="timeout" from="AnimationTimer" to="." method="_on_AnimationTimer_timeout"]
[connection signal="close_requested" from="OnionSkinningSettings" to="." method="_on_onion_skinning_settings_close_requested"] [connection signal="close_requested" from="OnionSkinningSettings" to="." method="_on_onion_skinning_settings_close_requested"]
[connection signal="visibility_changed" from="OnionSkinningSettings" to="." method="_on_onion_skinning_settings_visibility_changed"] [connection signal="visibility_changed" from="OnionSkinningSettings" to="." method="_on_onion_skinning_settings_visibility_changed"]

39
src/UI/Timeline/CelButton.gd
View file

@ -7,7 +7,7 @@ var layer := 0
var cel: BaseCel var cel: BaseCel
@onready var popup_menu: PopupMenu = get_node_or_null("PopupMenu") @onready var popup_menu: PopupMenu = get_node_or_null("PopupMenu")
@onready var linked_indicator: Polygon2D = get_node_or_null("LinkedIndicator") @onready var linked: ColorRect = $Linked
@onready var cel_texture: TextureRect = $CelTexture @onready var cel_texture: TextureRect = $CelTexture
@onready var transparent_checker: ColorRect = $CelTexture/TransparentChecker @onready var transparent_checker: ColorRect = $CelTexture/TransparentChecker
@onready var properties: AcceptDialog = $Properties @onready var properties: AcceptDialog = $Properties
@ -15,14 +15,34 @@ var cel: BaseCel
func _ready() -> void: func _ready() -> void:
Global.cel_switched.connect(cel_switched)
cel = Global.current_project.frames[frame].cels[layer] cel = Global.current_project.frames[frame].cels[layer]
button_setup() button_setup()
_dim_checker() _dim_checker()
cel.texture_changed.connect(_dim_checker) cel.texture_changed.connect(_dim_checker)
for selected in Global.current_project.selected_cels:
if selected[1] == layer and selected[0] == frame:
button_pressed = true
if cel is GroupCel: if cel is GroupCel:
transparent_checker.visible = false transparent_checker.visible = false
func cel_switched() -> void:
var current_theme: Theme = Global.control.theme
var is_guide := false
for selected in Global.current_project.selected_cels:
if selected[1] == layer or selected[0] == frame:
is_guide = true
break
if is_guide:
var guide_stylebox := current_theme.get_stylebox("guide", "CelButton")
add_theme_stylebox_override("normal", guide_stylebox)
else:
var normal_stylebox := current_theme.get_stylebox("normal", "CelButton")
add_theme_stylebox_override("normal", normal_stylebox)
z_index = 1 if button_pressed else 0
func button_setup() -> void: func button_setup() -> void:
custom_minimum_size.x = Global.animation_timeline.cel_size custom_minimum_size.x = Global.animation_timeline.cel_size
custom_minimum_size.y = Global.animation_timeline.cel_size custom_minimum_size.y = Global.animation_timeline.cel_size
@ -30,21 +50,10 @@ func button_setup() -> void:
var base_layer := Global.current_project.layers[layer] var base_layer := Global.current_project.layers[layer]
tooltip_text = tr("Frame: %s, Layer: %s") % [frame + 1, base_layer.name] tooltip_text = tr("Frame: %s, Layer: %s") % [frame + 1, base_layer.name]
cel_texture.texture = cel.image_texture cel_texture.texture = cel.image_texture
if is_instance_valid(linked_indicator): if is_instance_valid(linked):
linked_indicator.visible = cel.link_set != null linked.visible = cel.link_set != null
if cel.link_set != null: if cel.link_set != null:
linked_indicator.color.h = cel.link_set["hue"] linked.color.h = cel.link_set["hue"]
func _on_CelButton_resized() -> void:
cel_texture.custom_minimum_size.x = custom_minimum_size.x - 4
cel_texture.custom_minimum_size.y = custom_minimum_size.y - 4
if is_instance_valid(linked_indicator):
linked_indicator.polygon[1].x = custom_minimum_size.x
linked_indicator.polygon[2].x = custom_minimum_size.x
linked_indicator.polygon[2].y = custom_minimum_size.y
linked_indicator.polygon[3].y = custom_minimum_size.y
func _on_CelButton_pressed() -> void: func _on_CelButton_pressed() -> void:

44
src/UI/Timeline/CelButton.tscn
View file

@ -19,25 +19,44 @@ shader_parameter/follow_scale = false
[node name="CelButton" type="Button"] [node name="CelButton" type="Button"]
custom_minimum_size = Vector2(36, 36) custom_minimum_size = Vector2(36, 36)
offset_top = 18.0
offset_right = 36.0 offset_right = 36.0
offset_bottom = 54.0 offset_bottom = 36.0
pivot_offset = Vector2(-18, 6)
size_flags_horizontal = 0 size_flags_horizontal = 0
size_flags_vertical = 0 size_flags_vertical = 0
focus_mode = 0 focus_mode = 0
mouse_default_cursor_shape = 2 mouse_default_cursor_shape = 2
theme_type_variation = &"CelButton"
toggle_mode = true toggle_mode = true
button_mask = 7 button_mask = 7
script = ExtResource("1_iewgo") script = ExtResource("1_iewgo")
[node name="Linked" type="ColorRect" parent="."]
visible = false
custom_minimum_size = Vector2(0, 16)
layout_mode = 1
anchors_preset = 14
anchor_top = 0.5
anchor_right = 1.0
anchor_bottom = 0.5
offset_left = 1.0
offset_top = -8.0
offset_right = -1.0
offset_bottom = 8.0
grow_horizontal = 2
grow_vertical = 2
color = Color(0.4, 1, 0.4, 1)
[node name="CelTexture" type="TextureRect" parent="."] [node name="CelTexture" type="TextureRect" parent="."]
custom_minimum_size = Vector2(32, 32) layout_mode = 1
layout_mode = 0 anchors_preset = 15
offset_left = 2.0 anchor_right = 1.0
offset_top = 1.78536 anchor_bottom = 1.0
offset_right = 34.0 offset_left = 6.0
offset_bottom = 33.7854 offset_top = 6.0
offset_right = -6.0
offset_bottom = -6.0
grow_horizontal = 2
grow_vertical = 2
size_flags_horizontal = 0 size_flags_horizontal = 0
size_flags_vertical = 0 size_flags_vertical = 0
expand_mode = 1 expand_mode = 1
@ -64,12 +83,6 @@ item_2/id = 2
item_3/text = "Unlink Cels" item_3/text = "Unlink Cels"
item_3/id = 3 item_3/id = 3
[node name="LinkedIndicator" type="Polygon2D" parent="."]
color = Color(0, 1, 0, 1)
invert_enabled = true
invert_border = 1.0
polygon = PackedVector2Array(0, 0, 36, 0, 36, 36, 0, 36)
[node name="Properties" type="AcceptDialog" parent="."] [node name="Properties" type="AcceptDialog" parent="."]
title = "Cel properties" title = "Cel properties"
size = Vector2i(300, 111) size = Vector2i(300, 111)
@ -126,7 +139,6 @@ stretch_margin_bottom = 3
script = ExtResource("4_wcpcc") script = ExtResource("4_wcpcc")
[connection signal="pressed" from="." to="." method="_on_CelButton_pressed"] [connection signal="pressed" from="." to="." method="_on_CelButton_pressed"]
[connection signal="resized" from="." to="." method="_on_CelButton_resized"]
[connection signal="id_pressed" from="PopupMenu" to="." method="_on_PopupMenu_id_pressed"] [connection signal="id_pressed" from="PopupMenu" to="." method="_on_PopupMenu_id_pressed"]
[connection signal="visibility_changed" from="Properties" to="." method="_on_properties_visibility_changed"] [connection signal="visibility_changed" from="Properties" to="." method="_on_properties_visibility_changed"]
[connection signal="value_changed" from="Properties/GridContainer/OpacitySlider" to="." method="_on_opacity_slider_value_changed"] [connection signal="value_changed" from="Properties/GridContainer/OpacitySlider" to="." method="_on_opacity_slider_value_changed"]

1
src/UI/Timeline/FrameButton.gd
View file

@ -9,6 +9,7 @@ var frame := 0
func _ready() -> void: func _ready() -> void:
Global.cel_switched.connect(func(): z_index = 1 if button_pressed else 0)
custom_minimum_size.x = Global.animation_timeline.cel_size custom_minimum_size.x = Global.animation_timeline.cel_size
text = str(frame + 1) text = str(frame + 1)
pressed.connect(_button_pressed) pressed.connect(_button_pressed)

1
src/UI/Timeline/FrameButton.tscn
View file

@ -7,6 +7,7 @@ offset_right = 12.0
offset_bottom = 20.0 offset_bottom = 20.0
focus_mode = 0 focus_mode = 0
mouse_default_cursor_shape = 2 mouse_default_cursor_shape = 2
theme_type_variation = &"LayerFrameButton"
toggle_mode = true toggle_mode = true
button_mask = 7 button_mask = 7
text = "1" text = "1"

4
src/UI/Timeline/FrameScrollContainer.gd
View file

@ -2,12 +2,10 @@ extends Container
const PADDING := 1 const PADDING := 1
@export var h_scroll_bar_node_path: NodePath @export var h_scroll_bar: HScrollBar
@onready var h_scroll_bar: HScrollBar = get_node_or_null(h_scroll_bar_node_path)
func _ready(): func _ready():
clip_contents = true
sort_children.connect(_on_sort_children) sort_children.connect(_on_sort_children)
if is_instance_valid(h_scroll_bar): if is_instance_valid(h_scroll_bar):
h_scroll_bar.resized.connect(_update_scroll) h_scroll_bar.resized.connect(_update_scroll)

1
src/UI/Timeline/LayerButton.gd
View file

@ -15,6 +15,7 @@ var layer_index := 0
func _ready() -> void: func _ready() -> void:
Global.cel_switched.connect(func(): z_index = 1 if button_pressed else 0)
var layer := Global.current_project.layers[layer_index] var layer := Global.current_project.layers[layer_index]
if layer is PixelLayer: if layer is PixelLayer:
linked_button.visible = true linked_button.visible = true

5
src/UI/Timeline/LayerButton.tscn
View file

@ -11,6 +11,7 @@ offset_right = 200.0
offset_bottom = 36.0 offset_bottom = 36.0
focus_mode = 0 focus_mode = 0
mouse_default_cursor_shape = 2 mouse_default_cursor_shape = 2
theme_type_variation = &"LayerFrameButton"
toggle_mode = true toggle_mode = true
action_mode = 0 action_mode = 0
script = ExtResource("1_6hlpe") script = ExtResource("1_6hlpe")
@ -42,6 +43,7 @@ size_flags_horizontal = 0
size_flags_vertical = 4 size_flags_vertical = 4
tooltip_text = "Expand/collapse group" tooltip_text = "Expand/collapse group"
mouse_default_cursor_shape = 2 mouse_default_cursor_shape = 2
flat = true
[node name="TextureRect" type="TextureRect" parent="HBoxContainer/LayerButtons/ExpandButton"] [node name="TextureRect" type="TextureRect" parent="HBoxContainer/LayerButtons/ExpandButton"]
layout_mode = 0 layout_mode = 0
@ -66,6 +68,7 @@ size_flags_vertical = 4
tooltip_text = "Toggle layer's visibility" tooltip_text = "Toggle layer's visibility"
focus_mode = 0 focus_mode = 0
mouse_default_cursor_shape = 2 mouse_default_cursor_shape = 2
flat = true
[node name="TextureRect" type="TextureRect" parent="HBoxContainer/LayerButtons/VisibilityButton"] [node name="TextureRect" type="TextureRect" parent="HBoxContainer/LayerButtons/VisibilityButton"]
layout_mode = 0 layout_mode = 0
@ -90,6 +93,7 @@ size_flags_vertical = 4
tooltip_text = "Lock/unlock layer" tooltip_text = "Lock/unlock layer"
focus_mode = 0 focus_mode = 0
mouse_default_cursor_shape = 2 mouse_default_cursor_shape = 2
flat = true
[node name="TextureRect" type="TextureRect" parent="HBoxContainer/LayerButtons/LockButton"] [node name="TextureRect" type="TextureRect" parent="HBoxContainer/LayerButtons/LockButton"]
layout_mode = 0 layout_mode = 0
@ -116,6 +120,7 @@ tooltip_text = "Enable/disable automatic linking of new cels when creating new f
Linked cels share content across multiple frames" Linked cels share content across multiple frames"
mouse_default_cursor_shape = 2 mouse_default_cursor_shape = 2
flat = true
[node name="TextureRect" type="TextureRect" parent="HBoxContainer/LayerButtons/LinkButton"] [node name="TextureRect" type="TextureRect" parent="HBoxContainer/LayerButtons/LinkButton"]
layout_mode = 0 layout_mode = 0