Skip to content

Commit ca027eb

Browse files
committed
Confirmation box when removing custom slabs, column data always shows
1 parent 4f2bb62 commit ca027eb

File tree

3 files changed

+36
-14
lines changed

3 files changed

+36
-14
lines changed

Scenes/Main.tscn

+17
Original file line numberDiff line numberDiff line change
@@ -2140,6 +2140,22 @@ __meta__ = {
21402140
"_edit_use_anchors_": false
21412141
}
21422142

2143+
[node name="ConfirmDeleteCustomSlab" type="ConfirmationDialog" parent="Ui/UiSystem"]
2144+
visible = true
2145+
margin_left = 916.0
2146+
margin_top = -181.0
2147+
margin_right = 1216.0
2148+
margin_bottom = -76.0
2149+
rect_min_size = Vector2( 300, 105 )
2150+
popup_exclusive = true
2151+
window_title = "Confirm delete"
2152+
dialog_text = "Delete this custom slab?"
2153+
dialog_autowrap = true
2154+
script = ExtResource( 61 )
2155+
__meta__ = {
2156+
"_edit_use_anchors_": false
2157+
}
2158+
21432159
[node name="ConfirmSaveBeforeQuit" type="WindowDialog" parent="Ui/UiSystem"]
21442160
visible = true
21452161
margin_left = 944.0
@@ -6362,6 +6378,7 @@ script = SubResource( 20 )
63626378
[connection signal="confirmed" from="Ui/UiSystem/ConfirmDelete" to="Ui/UiSystem/MapBrowser" method="_on_ConfirmDelete_confirmed"]
63636379
[connection signal="confirmed" from="Ui/UiSystem/ConfirmDiscardChanges" to="Ui/UiSystem/Menu" method="_on_ConfirmDiscardChanges_confirmed"]
63646380
[connection signal="confirmed" from="Ui/UiSystem/ConfirmQuit" to="Editor" method="_on_ConfirmQuit_confirmed"]
6381+
[connection signal="confirmed" from="Ui/UiSystem/ConfirmDeleteCustomSlab" to="Ui/UiTools/PickSlabWindow" method="_on_ConfirmDeleteCustomSlab_confirmed"]
63656382
[connection signal="pressed" from="Ui/UiSystem/ConfirmSaveBeforeQuit/VBoxContainer/HBoxContainer/ButtonConfirmExitSave" to="Ui/UiSystem/ConfirmSaveBeforeQuit" method="_on_ButtonConfirmExitSave_pressed"]
63666383
[connection signal="pressed" from="Ui/UiSystem/ConfirmSaveBeforeQuit/VBoxContainer/HBoxContainer/ButtonConfirmExitDontSave" to="Ui/UiSystem/ConfirmSaveBeforeQuit" method="_on_ButtonConfirmExitDontSave_pressed"]
63676384
[connection signal="pressed" from="Ui/UiSystem/ConfirmSaveBeforeQuit/VBoxContainer/HBoxContainer/ButtonConfirmExitCancel" to="Ui/UiSystem/ConfirmSaveBeforeQuit" method="_on_ButtonConfirmExitCancel_pressed"]

Scenes/PickSlabWindow.gd

+11-6
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ onready var oColumnEditor = Nodelist.list["oColumnEditor"]
1515
onready var oColumnEditorTabs = Nodelist.list["oColumnEditorTabs"]
1616
onready var oDkDat = Nodelist.list["oDkDat"]
1717
onready var oPlaceLockedCheckBox = Nodelist.list["oPlaceLockedCheckBox"]
18+
onready var oConfirmDeleteCustomSlab = Nodelist.list["oConfirmDeleteCustomSlab"]
19+
1820

1921

2022
onready var oSelectedRect = $Clippy/SelectedRect
@@ -233,13 +235,16 @@ func _on_slab_portrait_gui_input(event, id):
233235
if event.is_action_pressed("mouse_right"):
234236
var slabID = id.get_meta("ID_of_slab")
235237
if slabID >= 1000:
236-
oCustomSlabSystem.remove_custom_slab(slabID)
237-
238-
for child in current_grid_container().get_children():
239-
if child.get_meta("ID_of_slab") == slabID:
240-
child.queue_free()
241-
238+
Utils.popup_centered(oConfirmDeleteCustomSlab)
239+
oConfirmDeleteCustomSlab.set_meta("ID_TO_DELETE", slabID)
242240
_on_hovered_none()
243241

244242
func rect_changed_start_timer():
245243
rectChangedTimer.start(0.2)
244+
245+
func _on_ConfirmDeleteCustomSlab_confirmed():
246+
var slabID = oConfirmDeleteCustomSlab.get_meta("ID_TO_DELETE")
247+
for child in tabs[Slabs.TAB_CUSTOM][GRIDCON_PATH].get_children():
248+
if child.has_meta("ID_of_slab") and child.get_meta("ID_of_slab") == slabID:
249+
child.queue_free()
250+
oCustomSlabSystem.remove_custom_slab(slabID)

Scenes/ViewColumn.gd

+8-8
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,14 @@ func update_details():
4040
# oColumnListData.clear()
4141
# return
4242

43-
if oColumnEditor.visible == true:
44-
if oColumnEditorVoxelView.visible == true:
45-
entryIndex = oColumnEditorVoxelView.viewObject
46-
if oCustomSlabVoxelView.visible == true:
47-
if is_instance_valid(get_focus_owner()):
48-
if is_instance_valid(get_focus_owner().get_parent()):
49-
if get_focus_owner().get_parent() is SpinBox:
50-
entryIndex = get_focus_owner().get_parent().value
43+
# if oColumnEditor.visible == true:
44+
# if oColumnEditorVoxelView.visible == true:
45+
# entryIndex = oColumnEditorVoxelView.viewObject
46+
# if oCustomSlabVoxelView.visible == true:
47+
# if is_instance_valid(get_focus_owner()):
48+
# if is_instance_valid(get_focus_owner().get_parent()):
49+
# if get_focus_owner().get_parent() is SpinBox:
50+
# entryIndex = get_focus_owner().get_parent().value
5151

5252
for i in 16:
5353
var description

0 commit comments

Comments
 (0)