upgrade tab search

Author: ArnoChenFx

NodeGraphQt/base/graph.py

@@ -5,7 +5,7 @@
 import re
 import copy
 
-from NodeGraphQt import QtCore, QtWidgets
+from NodeGraphQt import QtCore, QtWidgets, QtGui
 from NodeGraphQt.base.commands import (NodeAddedCmd,
                                        NodeRemovedCmd,
                                        NodeMovedCmd,
@@ -105,10 +105,9 @@ def __init__(self, parent=None):
         self._node_factory = NodeFactory()
         self._undo_stack = QtWidgets.QUndoStack(self)
 
-        tab = QtWidgets.QAction('Search Nodes', self)
-        tab.setShortcut('tab')
-        tab.triggered.connect(self._toggle_tab_search)
-        self._viewer.addAction(tab)
+        tab = QtWidgets.QShortcut(QtGui.QKeySequence(QtCore.Qt.Key_Tab), self._viewer)
+        tab.activated.connect(self._toggle_tab_search)
+        self._viewer.need_show_tab_search.connect(self._toggle_tab_search)
 
         self._wire_signals()
 
@@ -164,8 +163,9 @@ def _toggle_tab_search(self):
         """
         toggle the tab search widget.
         """
-        self._viewer.tab_search_set_nodes(self._node_factory.names)
-        self._viewer.tab_search_toggle()
+        if self._viewer.underMouse():
+            self._viewer.tab_search_set_nodes(self._node_factory.names)
+            self._viewer.tab_search_toggle()
 
     def _on_property_bin_changed(self, node_id, prop_name, prop_value):
         """

NodeGraphQt/widgets/viewer.py

@@ -33,6 +33,7 @@ class NodeViewer(QtWidgets.QGraphicsView):
     connection_sliced = QtCore.Signal(list)
     connection_changed = QtCore.Signal(list, list)
     insert_node = QtCore.Signal(object, str, dict)
+    need_show_tab_search = QtCore.Signal()
 
     # pass through signals
     node_selected = QtCore.Signal(str)
@@ -207,10 +208,13 @@ def contextMenuEvent(self, event):
                             action.node_id = node.id
 
         ctx_menu = ctx_menu or self._ctx_menu
-        if ctx_menu.isEnabled():
-            ctx_menu.exec_(event.globalPos())
+        if len(ctx_menu.actions()) > 0:
+            if ctx_menu.isEnabled():
+                ctx_menu.exec_(event.globalPos())
+            else:
+                return super(NodeViewer, self).contextMenuEvent(event)
         else:
-            return super(NodeViewer, self).contextMenuEvent(event)
+            self.need_show_tab_search.emit()
 
     def mousePressEvent(self, event):
         if event.button() == QtCore.Qt.LeftButton:
@@ -286,7 +290,6 @@ def mouseReleaseEvent(self, event):
         elif event.button() == QtCore.Qt.MiddleButton:
             self.MMB_state = False
 
-
         # hide pipe slicer.
         if self._SLICER_PIPE.isVisible():
             self._on_pipes_sliced(self._SLICER_PIPE.path())