tonytins/CozyPixelStudio
1
0
Fork 0
mirror of https://github.com/tonytins/CozyPixelStudio.git synced 2025-06-25 06:54:43 -04:00
Code Issues Projects Releases Wiki Activity

The guides can no longer be undone

Browse source 
They were causing issues with UndoRedo, and with the latest changes, even crashes. I decided to remove their UndoRedo behavior, at least for now.

Also put jegor377 to the list of Contributors.
This commit is contained in:
OverloadedOrama 2020-04-21 21:01:45 +03:00
parent 086679f1f0
commit 1e4a5cff8e
3 changed files with 7 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Scripts/Dialogs/AboutDialog.gd
View file

@ -30,6 +30,7 @@ func _ready() -> void:
contributors.create_item(contributor_root).set_text(0, " Matheus Pesegoginski (MatheusPese)")
contributors.create_item(contributor_root).set_text(0, " sapient_cogbag")
contributors.create_item(contributor_root).set_text(0, " Kinwailo")
contributors.create_item(contributor_root).set_text(0, " Igor Santarek (jegor377)")
var donors_root := donors.create_item()
donors.create_item(donors_root).set_text(0, " pcmxms")

18
Scripts/Rulers/Guides.gd
View file

@ -44,13 +44,6 @@ func _input(_event : InputEvent):
Global.has_focus = true
has_focus = false
if !outside_canvas():
Global.undos += 1
Global.undo_redo.create_action("Move Guide")
Global.undo_redo.add_do_method(self, "outside_canvas")
Global.undo_redo.add_do_property(self, "points", points)
Global.undo_redo.add_undo_property(self, "points", previous_points)
Global.undo_redo.add_undo_method(self, "outside_canvas", true)
Global.undo_redo.commit_action()
update()
@ -65,14 +58,8 @@ func _draw() -> void:
draw_set_transform(Vector2(points[0].x + font.get_height() * zoom.y, Global.camera.offset.y - (viewport_size.y / 2.25) * zoom.y), rotation, zoom * 2)
draw_string(font, Vector2.ZERO, "%spx" % str(round(mouse_pos.x)))
func outside_canvas(undo := false) -> bool:
if undo:
Global.undos -= 1
Global.notification_label("Move Guide")
if Global.control.redone:
if Global.undos < Global.undo_redo.get_version(): # If we did undo and then redo
Global.undos = Global.undo_redo.get_version()
Global.notification_label("Move Guide")
func outside_canvas() -> bool:
if type == Types.HORIZONTAL:
if points[0].y < 0 || points[0].y > Global.canvas.size.y:
queue_free()
@ -83,5 +70,6 @@ func outside_canvas(undo := false) -> bool:
return true
return false
func point_in_rectangle(p : Vector2, coord1 : Vector2, coord2 : Vector2) -> bool:
return p.x > coord1.x && p.y > coord1.y && p.x < coord2.x && p.y < coord2.y