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

Change blend modes of multiple selected layers from the timeline

Browse source 
And also add undo/redo when changing the blend mode from the layer properties dialog. Not sure why I had made their behaviors so inconsistent.
This commit is contained in:
Emmanouil Papadeas 2024-08-13 00:53:37 +03:00
parent d18acd9937
commit 8163015c02
2 changed files with 35 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -54,7 +54,7 @@ var layer_effect_settings: AcceptDialog:
func _ready() -> void:
Global.control.find_child("LayerProperties").visibility_changed.connect(_update_layer_ui)
Global.control.find_child("LayerProperties").layer_property_changed.connect(_update_layer_ui)
min_cel_size = get_tree().current_scene.theme.default_font_size + 24
layer_container.custom_minimum_size.x = layer_settings_container.size.x + 12
cel_size = min_cel_size
@ -221,21 +221,21 @@ func _cel_size_changed(value: int) -> void:
func _on_blend_modes_item_selected(index: int) -> void:
var current_layer := Global.current_project.layers[Global.current_project.current_layer]
var previous_mode := current_layer.blend_mode
var previous_index := blend_modes_button.get_item_index(previous_mode)
var project := Global.current_project
var current_mode := blend_modes_button.get_item_id(index)
Global.current_project.undo_redo.create_action("Set Blend Mode")
Global.current_project.undo_redo.add_do_method(Global.undo_or_redo.bind(false))
Global.current_project.undo_redo.add_do_property(current_layer, "blend_mode", current_mode)
Global.current_project.undo_redo.add_do_method(blend_modes_button.select.bind(index))
Global.current_project.undo_redo.add_do_method(Global.canvas.draw_layers)
Global.current_project.undo_redo.add_undo_property(current_layer, "blend_mode", previous_mode)
Global.current_project.undo_redo.add_undo_method(Global.undo_or_redo.bind(true))
Global.current_project.undo_redo.add_undo_method(blend_modes_button.select.bind(previous_index))
Global.current_project.undo_redo.add_undo_method(Global.canvas.draw_layers)
Global.current_project.undo_redo.commit_action()
project.undo_redo.create_action("Set Blend Mode")
for idx_pair in project.selected_cels:
var layer := project.layers[idx_pair[1]]
var previous_mode := layer.blend_mode
project.undo_redo.add_do_property(layer, "blend_mode", current_mode)
project.undo_redo.add_undo_property(layer, "blend_mode", previous_mode)
project.undo_redo.add_do_method(Global.undo_or_redo.bind(false))
project.undo_redo.add_do_method(_update_layer_ui)
project.undo_redo.add_do_method(Global.canvas.draw_layers)
project.undo_redo.add_undo_method(Global.undo_or_redo.bind(true))
project.undo_redo.add_undo_method(_update_layer_ui)
project.undo_redo.add_undo_method(Global.canvas.draw_layers)
project.undo_redo.commit_action()
func add_frame() -> void:

23
src/UI/Timeline/LayerProperties.gd
View file

@ -1,5 +1,7 @@
extends AcceptDialog
signal layer_property_changed
var layer_indices: PackedInt32Array
@onready var name_line_edit := $GridContainer/NameLineEdit as LineEdit
@ -60,19 +62,34 @@ func _on_opacity_slider_value_changed(value: float) -> void:
for layer_index in layer_indices:
var layer := Global.current_project.layers[layer_index]
layer.opacity = value / 100.0
_emit_layer_property_signal()
Global.canvas.queue_redraw()
func _on_blend_mode_option_button_item_selected(index: BaseLayer.BlendModes) -> void:
if layer_indices.size() == 0:
return
var project := Global.current_project
project.undo_redo.create_action("Set Blend Mode")
for layer_index in layer_indices:
var layer := Global.current_project.layers[layer_index]
layer.blend_mode = index
Global.canvas.queue_redraw()
var layer := project.layers[layer_index]
var previous_mode := layer.blend_mode
project.undo_redo.add_do_property(layer, "blend_mode", index)
project.undo_redo.add_undo_property(layer, "blend_mode", previous_mode)
project.undo_redo.add_do_method(Global.undo_or_redo.bind(false))
project.undo_redo.add_do_method(Global.canvas.draw_layers)
project.undo_redo.add_do_method(_emit_layer_property_signal)
project.undo_redo.add_undo_method(Global.undo_or_redo.bind(true))
project.undo_redo.add_undo_method(Global.canvas.draw_layers)
project.undo_redo.add_undo_method(_emit_layer_property_signal)
project.undo_redo.commit_action()
func _on_user_data_text_edit_text_changed() -> void:
for layer_index in layer_indices:
var layer := Global.current_project.layers[layer_index]
layer.user_data = user_data_text_edit.text
func _emit_layer_property_signal() -> void:
layer_property_changed.emit()