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

Made general undo and redo methods in Global.gd

Browse source 
To reduce some duplicate code, and they will most likely be needed for frame tags UndoRedo
This commit is contained in:
OverloadedOrama 2020-04-19 21:17:33 +03:00
parent 9cb98a443e
commit cb1b741b05
1 changed files with 28 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
Scripts/Global.gd
View file

@ -438,9 +438,24 @@ func notification_label(text : String) -> void:
notification.theme = control.theme notification.theme = control.theme
get_tree().get_root().add_child(notification) get_tree().get_root().add_child(notification)
func undo(_canvases : Array, layer_index : int = -1) -> void:
func general_undo() -> void:
undos -= 1 undos -= 1
var action_name := undo_redo.get_current_action_name() var action_name := undo_redo.get_current_action_name()
notification_label("Undo: %s" % action_name)
func general_redo() -> void:
if undos < undo_redo.get_version(): # If we did undo and then redo
undos = undo_redo.get_version()
if control.redone:
var action_name := undo_redo.get_current_action_name()
notification_label("Redo: %s" % action_name)
func undo(_canvases : Array, layer_index : int = -1) -> void:
general_undo()
var action_name := undo_redo.get_current_action_name()
if action_name == "Draw" || action_name == "Rectangle Select" || action_name == "Scale" || action_name == "Merge Layer": if action_name == "Draw" || action_name == "Rectangle Select" || action_name == "Scale" || action_name == "Merge Layer":
for c in _canvases: for c in _canvases:
if layer_index > -1: if layer_index > -1:
@ -469,12 +484,10 @@ func undo(_canvases : Array, layer_index : int = -1) -> void:
if saved: if saved:
saved = false saved = false
self.window_title = window_title + "(*)" self.window_title = window_title + "(*)"
notification_label("Undo: %s" % action_name)
func redo(_canvases : Array, layer_index : int = -1) -> void: func redo(_canvases : Array, layer_index : int = -1) -> void:
if undos < undo_redo.get_version(): # If we did undo and then redo general_redo()
undos = undo_redo.get_version()
var action_name := undo_redo.get_current_action_name() var action_name := undo_redo.get_current_action_name()
if action_name == "Draw" || action_name == "Rectangle Select" || action_name == "Scale" || action_name == "Merge Layer": if action_name == "Draw" || action_name == "Rectangle Select" || action_name == "Scale" || action_name == "Merge Layer":
for c in _canvases: for c in _canvases:
@ -502,13 +515,13 @@ func redo(_canvases : Array, layer_index : int = -1) -> void:
if saved: if saved:
saved = false saved = false
self.window_title = window_title + "(*)" self.window_title = window_title + "(*)"
if control.redone:
notification_label("Redo: %s" % action_name)
func title_changed(value : String) -> void: func title_changed(value : String) -> void:
window_title = value window_title = value
OS.set_window_title(value) OS.set_window_title(value)
func canvases_changed(value : Array) -> void: func canvases_changed(value : Array) -> void:
canvases = value canvases = value
for container in frames_container.get_children(): for container in frames_container.get_children():
@ -550,6 +563,7 @@ func canvases_changed(value : Array) -> void:
animation_timeline.first_frame = tag[2] - 1 animation_timeline.first_frame = tag[2] - 1
animation_timeline.last_frame = min(canvases.size() - 1, tag[3] - 1) animation_timeline.last_frame = min(canvases.size() - 1, tag[3] - 1)
func clear_canvases() -> void: func clear_canvases() -> void:
for child in canvas_parent.get_children(): for child in canvas_parent.get_children():
if child is Canvas: if child is Canvas:
@ -561,6 +575,7 @@ func clear_canvases() -> void:
window_title = "(" + tr("untitled") + ") - Pixelorama" window_title = "(" + tr("untitled") + ") - Pixelorama"
undo_redo.clear_history(false) undo_redo.clear_history(false)
func layers_changed(value : Array) -> void: func layers_changed(value : Array) -> void:
layers = value layers = value
if layers_changed_skip: if layers_changed_skip:
@ -616,6 +631,7 @@ func layers_changed(value : Array) -> void:
remove_layer_button.disabled = false remove_layer_button.disabled = false
remove_layer_button.mouse_default_cursor_shape = Control.CURSOR_POINTING_HAND remove_layer_button.mouse_default_cursor_shape = Control.CURSOR_POINTING_HAND
func frame_changed(value : int) -> void: func frame_changed(value : int) -> void:
current_frame = value current_frame = value
current_frame_label.text = tr("Current frame:") + " %s/%s" % [str(current_frame + 1), canvases.size()] current_frame_label.text = tr("Current frame:") + " %s/%s" % [str(current_frame + 1), canvases.size()]
@ -641,6 +657,7 @@ func frame_changed(value : int) -> void:
if current_frame < layers[current_layer][3].get_child_count(): if current_frame < layers[current_layer][3].get_child_count():
layers[current_layer][3].get_child(current_frame).pressed = true layers[current_layer][3].get_child(current_frame).pressed = true
func layer_changed(value : int) -> void: func layer_changed(value : int) -> void:
current_layer = value current_layer = value
layer_opacity_slider.value = canvas.layers[current_layer][2] * 100 layer_opacity_slider.value = canvas.layers[current_layer][2] * 100
@ -821,23 +838,22 @@ func remove_brush_buttons() -> void:
for child in project_brush_container.get_children(): for child in project_brush_container.get_children():
child.queue_free() child.queue_free()
func undo_custom_brush(_brush_button : BaseButton = null) -> void: func undo_custom_brush(_brush_button : BaseButton = null) -> void:
undos -= 1 general_undo()
var action_name := undo_redo.get_current_action_name() var action_name := undo_redo.get_current_action_name()
if action_name == "Delete Custom Brush": if action_name == "Delete Custom Brush":
project_brush_container.add_child(_brush_button) project_brush_container.add_child(_brush_button)
project_brush_container.move_child(_brush_button, _brush_button.custom_brush_index - brushes_from_files) project_brush_container.move_child(_brush_button, _brush_button.custom_brush_index - brushes_from_files)
_brush_button.get_node("DeleteButton").visible = false _brush_button.get_node("DeleteButton").visible = false
notification_label("Undo: %s" % action_name)
func redo_custom_brush(_brush_button : BaseButton = null) -> void: func redo_custom_brush(_brush_button : BaseButton = null) -> void:
if undos < undo_redo.get_version(): # If we did undo and then redo general_redo()
undos = undo_redo.get_version()
var action_name := undo_redo.get_current_action_name() var action_name := undo_redo.get_current_action_name()
if action_name == "Delete Custom Brush": if action_name == "Delete Custom Brush":
project_brush_container.remove_child(_brush_button) project_brush_container.remove_child(_brush_button)
if control.redone:
notification_label("Redo: %s" % action_name)
func update_left_custom_brush() -> void: func update_left_custom_brush() -> void:
if current_left_brush_type == Brush_Types.PIXEL: if current_left_brush_type == Brush_Types.PIXEL: