Skip to content

Commit cdfa171

Browse files
authored
Merge pull request #1061 from williamchange/fix-comment-nodes-undo
Fix comment nodes not undoing position offset
2 parents 0dbd6df + e86ddd6 commit cdfa171

File tree

2 files changed

+12
-1
lines changed

2 files changed

+12
-1
lines changed

material_maker/nodes/comment/comment.gd

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ class_name MMGraphComment
66
@onready var title_edit = %TitleEdit
77
@onready var editor = %Text
88

9+
var disable_undoredo_for_offset : bool = false
910

1011
var generator : MMGenComment:
1112
set(g):
@@ -33,8 +34,10 @@ const AUTO_SIZE_TOP_PADDING : int = 72
3334

3435

3536
func do_set_position(o : Vector2) -> void:
37+
disable_undoredo_for_offset = true
3638
position_offset = o
3739
generator.position = o
40+
disable_undoredo_for_offset = false
3841

3942
func _on_resize_request(new_size : Vector2) -> void:
4043
var parent : GraphEdit = get_parent()
@@ -194,6 +197,9 @@ func _on_dragged(_from, to):
194197

195198
func _on_position_offset_changed():
196199
_on_raise_request()
200+
if ! disable_undoredo_for_offset:
201+
get_parent().undoredo_move_node(generator.name, generator.position, position_offset)
202+
generator.set_position(position_offset)
197203

198204
func _on_node_selected():
199205
_on_raise_request()

material_maker/nodes/comment_line/comment_line.gd

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ class_name MMGraphCommentLine
66
@onready var editor = %TextEditor
77
@onready var label = %TextLabel
88

9+
var disable_undoredo_for_offset : bool = false
910

1011
var generator : MMGenCommentLine:
1112
set(g):
@@ -15,8 +16,10 @@ var generator : MMGenCommentLine:
1516

1617

1718
func do_set_position(o : Vector2) -> void:
19+
disable_undoredo_for_offset = true
1820
position_offset = o
1921
generator.position = o
22+
disable_undoredo_for_offset = false
2023

2124

2225
func _on_node_selected() -> void:
@@ -46,7 +49,9 @@ func _on_dragged(_from, to) -> void:
4649

4750

4851
func _on_position_offset_changed() -> void:
49-
pass
52+
if ! disable_undoredo_for_offset:
53+
get_parent().undoredo_move_node(generator.name, generator.position, position_offset)
54+
generator.set_position(position_offset)
5055

5156

5257
func _on_text_label_gui_input(event: InputEvent) -> void:

0 commit comments

Comments
 (0)