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

fix remaining tag issues

Browse source
This commit is contained in:
Variable 2023-05-17 13:53:11 +05:00 • committed by GitHub
parent 1f96aa13bc
commit cdd2017744
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -89,18 +89,28 @@ func _get_minimum_size() -> Vector2:
return Vector2(Global.layer_vbox.rect_size.x + cel_size + 26, cel_size + 105) return Vector2(Global.layer_vbox.rect_size.x + cel_size + 26, cel_size + 105)
func _frame_scroll_changed(value: float) -> void: func _frame_scroll_changed(_value: float) -> void:
# Update the tag scroll as well: # Update the tag scroll as well:
tag_scroll_container.get_child(0).rect_min_size.x = Global.frame_hbox.rect_size.x adjust_scroll_container()
tag_scroll_container.scroll_horizontal = value
func _on_LayerVBox_resized() -> void: func _on_LayerVBox_resized() -> void:
frame_scroll_bar.margin_left = frame_scroll_container.rect_position.x frame_scroll_bar.margin_left = frame_scroll_container.rect_position.x
adjust_scroll_container()
func adjust_scroll_container():
tag_spacer.rect_min_size.x = ( tag_spacer.rect_min_size.x = (
frame_scroll_container.rect_global_position.x frame_scroll_container.rect_global_position.x
- tag_scroll_container.rect_global_position.x - tag_scroll_container.rect_global_position.x
) )
print(" ")
tag_scroll_container.get_child(0).rect_min_size.x = Global.frame_hbox.rect_size.x
Global.tag_container.rect_min_size = Global.frame_hbox.rect_size
tag_scroll_container.scroll_horizontal = frame_scroll_bar.value
print(tag_scroll_container.get_child(0).rect_min_size.x)
print(Global.tag_container.rect_min_size)
print(tag_scroll_container.scroll_horizontal)
func _on_LayerFrameSplitContainer_gui_input(event: InputEvent) -> void: func _on_LayerFrameSplitContainer_gui_input(event: InputEvent) -> void:
@ -189,6 +199,8 @@ func add_frame() -> void:
project.undo_redo.add_do_method(project, "change_cel", project.current_frame + 1) project.undo_redo.add_do_method(project, "change_cel", project.current_frame + 1)
project.undo_redo.add_undo_method(project, "change_cel", project.current_frame) project.undo_redo.add_undo_method(project, "change_cel", project.current_frame)
project.undo_redo.commit_action() project.undo_redo.commit_action()
yield(get_tree(), "idle_frame")
adjust_scroll_container()
func _on_DeleteFrame_pressed() -> void: func _on_DeleteFrame_pressed() -> void:
@ -256,6 +268,8 @@ func delete_frames(indices := []) -> void:
project.undo_redo.add_do_method(Global, "undo_or_redo", false) project.undo_redo.add_do_method(Global, "undo_or_redo", false)
project.undo_redo.add_undo_method(Global, "undo_or_redo", true) project.undo_redo.add_undo_method(Global, "undo_or_redo", true)
project.undo_redo.commit_action() project.undo_redo.commit_action()
yield(get_tree(), "idle_frame")
adjust_scroll_container()
func _on_CopyFrame_pressed() -> void: func _on_CopyFrame_pressed() -> void:
@ -277,7 +291,7 @@ func copy_frames(indices := [], destination := -1) -> void:
var copied_frames := [] var copied_frames := []
var copied_indices := [] # the indices of newly copied frames var copied_indices := [] # the indices of newly copied frames
if destination != -1: if destination != -1:
copied_indices = range((destination + 1), (destination + 1) + indices.size()) copied_indices = range(destination + 1, (destination + 1) + indices.size())
else: else:
copied_indices = range(indices[-1] + 1, indices[-1] + 1 + indices.size()) copied_indices = range(indices[-1] + 1, indices[-1] + 1 + indices.size())
@ -389,7 +403,7 @@ func _on_TagList_id_pressed(id: int) -> void:
var frames = [] var frames = []
for i in range(tag.from - 1, tag.to): for i in range(tag.from - 1, tag.to):
frames.append(i) frames.append(i)
copy_frames(frames, Global.current_project.current_frame) copy_frames(frames, Global.current_project.current_frame - 1)
func _on_FrameTagButton_pressed() -> void: func _on_FrameTagButton_pressed() -> void: