kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Draft: Fix finish behavior of Draft_Edit on doc close

Browse Source 
Forum topic:
https://forum.freecad.org/viewtopic.php?p=794746#p794746
This commit is contained in:
Roy-043
2024-11-30 11:47:10 +01:00
parent f72679f6a5
commit 1768efcf4d
1 changed files with 26 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/Mod/Draft/draftguitools/gui_edit.py
View File

@@ -340,8 +340,11 @@ class Edit(gui_base_original.Modifier):
self.running = False
# delay resetting edit mode otherwise it doesn't happen
from PySide import QtCore
QtCore.QTimer.singleShot(0, Gui.ActiveDocument.resetEdit)
QtCore.QTimer.singleShot(0, self.reset_edit)
def reset_edit(self):
if Gui.ActiveDocument is not None:
Gui.ActiveDocument.resetEdit()
# -------------------------------------------------------------------------
# SCENE EVENTS CALLBACKS
@@ -356,8 +359,12 @@ class Edit(gui_base_original.Modifier):
"""
remove selection callback if it exists
"""
if self.selection_callback:
self.view.removeEventCallback("SoEvent", self.selection_callback)
try:
if self.selection_callback:
self.view.removeEventCallback("SoEvent", self.selection_callback)
except RuntimeError:
# the view has been deleted already
pass
self.selection_callback = None
def register_editing_callbacks(self):
@@ -380,18 +387,22 @@ class Edit(gui_base_original.Modifier):
"""
remove callbacks used during editing if they exist
"""
if self._keyPressedCB:
self.view.removeEventCallbackSWIG(coin.SoKeyboardEvent.getClassTypeId(), self._keyPressedCB)
self._keyPressedCB = None
#App.Console.PrintMessage("Draft edit keyboard callback unregistered \n")
if self._mouseMovedCB:
self.view.removeEventCallbackSWIG(coin.SoLocation2Event.getClassTypeId(), self._mouseMovedCB)
self._mouseMovedCB = None
#App.Console.PrintMessage("Draft edit location callback unregistered \n")
if self._mousePressedCB:
self.view.removeEventCallbackSWIG(coin.SoMouseButtonEvent.getClassTypeId(), self._mousePressedCB)
self._mousePressedCB = None
#App.Console.PrintMessage("Draft edit mouse button callback unregistered \n")
try:
if self._keyPressedCB:
self.view.removeEventCallbackSWIG(coin.SoKeyboardEvent.getClassTypeId(), self._keyPressedCB)
#App.Console.PrintMessage("Draft edit keyboard callback unregistered \n")
if self._mouseMovedCB:
self.view.removeEventCallbackSWIG(coin.SoLocation2Event.getClassTypeId(), self._mouseMovedCB)
#App.Console.PrintMessage("Draft edit location callback unregistered \n")
if self._mousePressedCB:
self.view.removeEventCallbackSWIG(coin.SoMouseButtonEvent.getClassTypeId(), self._mousePressedCB)
#App.Console.PrintMessage("Draft edit mouse button callback unregistered \n")
except RuntimeError:
# the view has been deleted already
pass
self._keyPressedCB = None
self._mouseMovedCB = None
self._mousePressedCB = None
# -------------------------------------------------------------------------
# SCENE EVENT HANDLERS