huskee/Pixelorama
1
0
Fork 0
mirror of https://github.com/Orama-Interactive/Pixelorama.git synced 2025-01-31 07:29:49 +00:00
Code Issues Wiki Activity

Clone audio layers, disable layer merge and FX buttons when an audio layer is selected

Browse source
This commit is contained in:
Emmanouil Papadeas 2024-12-10 21:26:46 +02:00
parent c56b242c46
commit b7d4a9bd77
2 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -41,6 +41,7 @@ var global_layer_expand := true
@onready var move_up_layer := %MoveUpLayer as Button @onready var move_up_layer := %MoveUpLayer as Button
@onready var move_down_layer := %MoveDownLayer as Button @onready var move_down_layer := %MoveDownLayer as Button
@onready var merge_down_layer := %MergeDownLayer as Button @onready var merge_down_layer := %MergeDownLayer as Button
@onready var layer_fx := %LayerFX as Button
@onready var blend_modes_button := %BlendModes as OptionButton @onready var blend_modes_button := %BlendModes as OptionButton
@onready var opacity_slider := %OpacitySlider as ValueSlider @onready var opacity_slider := %OpacitySlider as ValueSlider
@onready var frame_scroll_container := %FrameScrollContainer as Control @onready var frame_scroll_container := %FrameScrollContainer as Control
@ -906,6 +907,8 @@ func _on_CloneLayer_pressed() -> void:
cl_layer = LayerTileMap.new(project, src_layer.tileset) cl_layer = LayerTileMap.new(project, src_layer.tileset)
else: else:
cl_layer = src_layer.get_script().new(project) cl_layer = src_layer.get_script().new(project)
if src_layer is AudioLayer:
cl_layer.audio = src_layer.audio
cl_layer.project = project cl_layer.project = project
cl_layer.index = src_layer.index cl_layer.index = src_layer.index
var src_layer_data: Dictionary = src_layer.serialize() var src_layer_data: Dictionary = src_layer.serialize()
@ -1193,10 +1196,13 @@ func _toggle_layer_buttons() -> void:
( (
project.current_layer == child_count project.current_layer == child_count
or layer is GroupLayer or layer is GroupLayer
or layer is AudioLayer
or project.layers[project.current_layer - 1] is GroupLayer or project.layers[project.current_layer - 1] is GroupLayer
or project.layers[project.current_layer - 1] is Layer3D or project.layers[project.current_layer - 1] is Layer3D
or project.layers[project.current_layer - 1] is AudioLayer
) )
) )
Global.disable_button(layer_fx, layer is AudioLayer)
func project_changed() -> void: func project_changed() -> void:

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

@ -382,6 +382,7 @@ texture = ExtResource("5")
stretch_mode = 3 stretch_mode = 3
[node name="LayerFX" type="Button" parent="TimelineContainer/TimelineButtons/LayerTools/MarginContainer/LayerSettingsContainer/LayerButtons" groups=["UIButtons"]] [node name="LayerFX" type="Button" parent="TimelineContainer/TimelineButtons/LayerTools/MarginContainer/LayerSettingsContainer/LayerButtons" groups=["UIButtons"]]
unique_name_in_owner = true
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