Fix selector focus for dialog mode

Author: KnowZero

plugindevtools/PluginDevTools/PluginDevToolsWidget.py

@@ -1042,7 +1042,7 @@ def findAncestor(self, ancestor, obj):
                 parent = obj.parent()
 
         def setCurrentSelector(self, obj, localCall = True):
-            if obj and not sip.isdeleted(obj) and obj is not self.currentWidget and self.findAncestor(self.currentWindow,obj):
+            if obj and not sip.isdeleted(obj) and obj is not self.currentWidget and self.findAncestor(self.currentWindow,obj) and self.selectorWidget:
                 self.selectorWidget.setVisible(True)
 
                 if self.useStyleSheet:
@@ -1085,20 +1085,22 @@ def __init__(self, caller, parent=None):
             def eventFilter(self, obj, event):
                 etype = event.type()
 
-                if etype == 129 or (etype == 6 and event.key() == self.caller.modKey[1]):
-                    if etype == 6 and event.key() == self.caller.modKey[1]:
+                if etype == QEvent.HoverMove or (etype == QEvent.KeyPress and event.key() == self.caller.modKey[1]):
+                    if etype == QEvent.KeyPress and event.key() == self.caller.modKey[1]:
                         win = QtWidgets.qApp.activeWindow()
                         self.caller.selectorWidget=win.findChild(QWidget, "DevToolsSelectorWidget", Qt.FindDirectChildrenOnly)
 
                     if QApplication.keyboardModifiers() == self.caller.modKey[0]:
+                        win = QtWidgets.qApp.activeWindow()
+                        if win.__class__.__name__ == 'PluginDevToolsDialog':
+                                win.parentWidget().activateWindow()
                         pos = QCursor.pos()
                         onWidget = QApplication.widgetAt(pos)
                         self.caller.setCurrentSelector(onWidget)
-                elif etype == 7 and event.key() == self.caller.modKey[1] and self.caller.currentWidget:
+                elif etype == QEvent.KeyRelease and event.key() == self.caller.modKey[1] and self.caller.currentWidget:
                         self.caller.finishedSampling()
 
 
-                #print (obj, event.type())
                 return False