huskee/Pixelorama
1
0
Fork 0
mirror of https://github.com/Orama-Interactive/Pixelorama.git synced 2025-02-22 13:33:13 +00:00
Code Issues Wiki Activity

Lazy load the layer fx settings dialog

Browse source
This commit is contained in:
Emmanouil Papadeas 2024-03-20 19:03:46 +02:00
parent 6f3796627f
commit 722cb1a1e4
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -4,6 +4,7 @@ signal animation_started(forward: bool)
signal animation_finished signal animation_finished
const FRAME_BUTTON_TSCN := preload("res://src/UI/Timeline/FrameButton.tscn") const FRAME_BUTTON_TSCN := preload("res://src/UI/Timeline/FrameButton.tscn")
const LAYER_FX_SCENE_PATH := "res://src/UI/Timeline/LayerEffects/LayerEffectsSettings.tscn"
var is_animation_running := false var is_animation_running := false
var animation_loop := 1 ## 0 is no loop, 1 is cycle loop, 2 is ping-pong loop var animation_loop := 1 ## 0 is no loop, 1 is cycle loop, 2 is ping-pong loop
@ -17,6 +18,12 @@ var min_cel_size := 36
var max_cel_size := 144 var max_cel_size := 144
var past_above_canvas := true var past_above_canvas := true
var future_above_canvas := true var future_above_canvas := true
var layer_effect_settings: AcceptDialog:
get:
if not is_instance_valid(layer_effect_settings):
layer_effect_settings = load(LAYER_FX_SCENE_PATH).instantiate()
add_child(layer_effect_settings)
return layer_effect_settings
@onready var old_scroll := 0 ## The previous scroll state of $ScrollContainer @onready var old_scroll := 0 ## The previous scroll state of $ScrollContainer
@onready var tag_spacer := %TagSpacer as Control @onready var tag_spacer := %TagSpacer as Control
@ -1164,5 +1171,5 @@ func project_cel_removed(frame: int, layer: int) -> void:
func _on_layer_fx_pressed() -> void: func _on_layer_fx_pressed() -> void:
$LayerEffectsSettings.popup_centered() layer_effect_settings.popup_centered()
Global.dialog_open(true) Global.dialog_open(true)

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

@ -1,4 +1,4 @@
[gd_scene load_steps=78 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="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"]
@ -21,7 +21,6 @@
[ext_resource type="Texture2D" uid="uid://esistdjfbrc4" path="res://assets/graphics/timeline/play_backwards.png" id="24"] [ext_resource type="Texture2D" uid="uid://esistdjfbrc4" path="res://assets/graphics/timeline/play_backwards.png" id="24"]
[ext_resource type="Texture2D" uid="uid://l4jj86y1hukm" path="res://assets/graphics/timeline/go_to_last_frame.png" id="25"] [ext_resource type="Texture2D" uid="uid://l4jj86y1hukm" path="res://assets/graphics/timeline/go_to_last_frame.png" id="25"]
[ext_resource type="Texture2D" uid="uid://b2ndrc0cvy1m5" path="res://assets/graphics/timeline/next_frame.png" id="26"] [ext_resource type="Texture2D" uid="uid://b2ndrc0cvy1m5" path="res://assets/graphics/timeline/next_frame.png" id="26"]
[ext_resource type="PackedScene" uid="uid://dd1fkkc3vjh78" path="res://src/UI/Timeline/LayerEffects/LayerEffectsSettings.tscn" id="26_vbrbd"]
[ext_resource type="Texture2D" uid="uid://cerkv5yx4cqeh" path="res://assets/graphics/timeline/copy_frame.png" id="27"] [ext_resource type="Texture2D" uid="uid://cerkv5yx4cqeh" path="res://assets/graphics/timeline/copy_frame.png" id="27"]
[ext_resource type="Texture2D" uid="uid://i13jhsg117kd" path="res://assets/graphics/timeline/tag.png" id="28"] [ext_resource type="Texture2D" uid="uid://i13jhsg117kd" path="res://assets/graphics/timeline/tag.png" id="28"]
[ext_resource type="Texture2D" uid="uid://dukip7mvotxsp" path="res://assets/graphics/timeline/onion_skinning_off.png" id="29"] [ext_resource type="Texture2D" uid="uid://dukip7mvotxsp" path="res://assets/graphics/timeline/onion_skinning_off.png" id="29"]
@ -985,8 +984,6 @@ popup/item_1/id = 1
[node name="FrameTagDialog" parent="." instance=ExtResource("42")] [node name="FrameTagDialog" parent="." instance=ExtResource("42")]
[node name="LayerEffectsSettings" parent="." instance=ExtResource("26_vbrbd")]
[node name="DragHighlight" type="ColorRect" parent="."] [node name="DragHighlight" type="ColorRect" parent="."]
visible = false visible = false
layout_mode = 0 layout_mode = 0