From 87da750d56a7bbdb250a9ce1f603fd0fbe000f74 Mon Sep 17 00:00:00 2001
From: Yorik van Havre <yorik@uncreated.net>
Date: Sun, 31 Jan 2016 16:28:13 -0200
Subject: [PATCH] Draft: fixed bug in task panels

---
 src/Mod/Arch/ArchComponent.py | 12 +++++++-----
 src/Mod/Draft/Draft.py        |  6 ++++--
 src/Mod/Draft/DraftGui.py     |  6 ++++--
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/Mod/Arch/ArchComponent.py b/src/Mod/Arch/ArchComponent.py
index c2ab24abf..de9a5705f 100644
--- a/src/Mod/Arch/ArchComponent.py
+++ b/src/Mod/Arch/ArchComponent.py
@@ -766,11 +766,13 @@ class ViewProviderComponent:
         return []
 
     def setEdit(self,vobj,mode):
-        taskd = ComponentTaskPanel()
-        taskd.obj = self.Object
-        taskd.update()
-        FreeCADGui.Control.showDialog(taskd)
-        return True
+        if mode == 0:
+            taskd = ComponentTaskPanel()
+            taskd.obj = self.Object
+            taskd.update()
+            FreeCADGui.Control.showDialog(taskd)
+            return True
+        return False
 
     def unsetEdit(self,vobj,mode):
         FreeCADGui.Control.closeDialog()
diff --git a/src/Mod/Draft/Draft.py b/src/Mod/Draft/Draft.py
index 77752c9f9..9090ee77e 100644
--- a/src/Mod/Draft/Draft.py
+++ b/src/Mod/Draft/Draft.py
@@ -3288,8 +3288,10 @@ class _ViewProviderDraft:
         return
 
     def setEdit(self,vobj,mode=0):
-        FreeCADGui.runCommand("Draft_Edit")
-        return True
+        if mode == 0:
+            FreeCADGui.runCommand("Draft_Edit")
+            return True
+        return False
 
     def unsetEdit(self,vobj,mode=0):
         if FreeCAD.activeDraftCommand:
diff --git a/src/Mod/Draft/DraftGui.py b/src/Mod/Draft/DraftGui.py
index c597a7df9..0de6d70a2 100644
--- a/src/Mod/Draft/DraftGui.py
+++ b/src/Mod/Draft/DraftGui.py
@@ -204,8 +204,8 @@ class DraftTaskPanel:
         return int(QtGui.QDialogButtonBox.Ok) | int(QtGui.QDialogButtonBox.Close)
     def accept(self):
         if hasattr(FreeCADGui,"draftToolBar"):
-            print "validating"
             FreeCADGui.draftToolBar.validatePoint()
+            return True
         else:
             FreeCADGui.ActiveDocument.resetEdit()
             return True
@@ -1192,7 +1192,7 @@ class DraftToolBar:
                     pass
                 else:
                     self.sourceCmd.offsetHandler(offset)
-            else:
+            elif (self.labelx.isVisible()):
                 try:
                     #numx=float(self.xValue.text())
                     numx = self.x
@@ -1223,6 +1223,8 @@ class DraftToolBar:
                                 numy = last.y + v.y
                                 numz = last.z + v.z
                         self.sourceCmd.numericInput(numx,numy,numz)
+            else:
+                FreeCADGui.ActiveDocument.resetEdit()
 
     def validateSNumeric(self):
         ''' send valid numeric parameters to ShapeString '''