suzanne.soy/SearchBar
1
0
Fork 0
Code Issues 20 Pull Requests 2 Actions Packages Projects Releases Wiki Activity

Fixed bugs related to the loss of focus from the 3D view and other 3D view bugs

Browse Source
This commit is contained in:
Suzanne Soy 2021-10-02 23:48:38 +01:00
parent aee0069136
commit 25d0ed1e7c
1 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
SearchTools.py
View File

@ -15,12 +15,13 @@ OK fix sync problem when moving too fast
OK split the list of tools vs. document objects OK split the list of tools vs. document objects
OK save to disk the list of tools OK save to disk the list of tools
OK always display including when switching workbenches OK always display including when switching workbenches
* slightly larger popup widget to avoid scrollbar for the extra info for document objects OK slightly larger popup widget to avoid scrollbar for the extra info for document objects
OK turn this into a standalone mod OK turn this into a standalone mod
OK Optimize so that it's not so slow OK Optimize so that it's not so slow
OK speed up startup to show the box instantly and do the slow loading on first click. OK speed up startup to show the box instantly and do the slow loading on first click.
* One small bug: when the 3D view is initialized, it causes a loss of focus on the drop-down. We restore it, but the currently-selected index is left unchanged, so the down or up arrow has to be pressed twice. OK One small bug: when the 3D view is initialized, it causes a loss of focus on the drop-down. We restore it, but the currently-selected index is left unchanged, so the down or up arrow has to be pressed twice.
* split into several files, try to keep the absolute minimum of code possible in the main file to speed up startup * split into several files, try to keep the absolute minimum of code possible in the main file to speed up startup
* segfault when reloading
""" """
################################"" ################################""
@ -166,7 +167,11 @@ actionHandlers = {
# I'm giving up on getting this viewer to work in a clean way, and will try swapping two instances so that the same one is never used twice in a row. # I'm giving up on getting this viewer to work in a clean way, and will try swapping two instances so that the same one is never used twice in a row.
# Also, in order to avoid segfaults when the module is reloaded (which causes the previous viewer to be garbage collected at some point), we're using a global property that will survive module reloads. # Also, in order to avoid segfaults when the module is reloaded (which causes the previous viewer to be garbage collected at some point), we're using a global property that will survive module reloads.
if not hasattr(App, '_SearchTools3DViewer'): if not hasattr(App, '_SearchTools3DViewer'):
# Toggle between
App._SearchTools3DViewer = None App._SearchTools3DViewer = None
App._SearchTools3DViewerB = None
globalIgnoreFocusOut = False
import pivy import pivy
class DocumentObjectToolTipWidget(QtGui.QWidget): class DocumentObjectToolTipWidget(QtGui.QWidget):
@ -180,11 +185,16 @@ class DocumentObjectToolTipWidget(QtGui.QWidget):
if App._SearchTools3DViewer is None: if App._SearchTools3DViewer is None:
oldFocus = QtGui.QApplication.focusWidget() oldFocus = QtGui.QApplication.focusWidget()
global globalIgnoreFocusOut
globalIgnoreFocusOut = True
App._SearchTools3DViewer = SafeViewer() App._SearchTools3DViewer = SafeViewer()
App._SearchTools3DViewerB = SafeViewer()
oldFocus.setFocus() oldFocus.setFocus()
globalIgnoreFocusOut = False
# Tried setting the preview to a fixed size to prevent it from disappearing when changing its contents, this sets it to a fixed size but doesn't actually pick the size, .resize does that but isn't enough to fix the bug. # Tried setting the preview to a fixed size to prevent it from disappearing when changing its contents, this sets it to a fixed size but doesn't actually pick the size, .resize does that but isn't enough to fix the bug.
#safeViewerInstance.setSizePolicy(QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Fixed)) #safeViewerInstance.setSizePolicy(QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Fixed))
self.preview = App._SearchTools3DViewer self.preview = App._SearchTools3DViewer
App._SearchTools3DViewer, App._SearchTools3DViewerB = App._SearchTools3DViewerB, App._SearchTools3DViewer
obj = App.getDocument(str(nfo['toolTip']['docName'])).getObject(str(nfo['toolTip']['name'])) obj = App.getDocument(str(nfo['toolTip']['docName'])).getObject(str(nfo['toolTip']['name']))
## dummy preview: ## dummy preview:
@ -208,9 +218,9 @@ class DocumentObjectToolTipWidget(QtGui.QWidget):
self.setLayout(lay) self.setLayout(lay)
lay.addWidget(description) lay.addWidget(description)
lay.addWidget(self.preview) lay.addWidget(self.preview)
if oldParent is not None: #if oldParent is not None:
oldParent.hide() # hide before detaching, or we have widgets floating as their own window that appear for a split second in some cases. # oldParent.hide() # hide before detaching, or we have widgets floating as their own window that appear for a split second in some cases.
oldParent.setParent(None) # oldParent.setParent(None)
# Tried hiding/detaching the preview to prevent it from disappearing when changing its contents # Tried hiding/detaching the preview to prevent it from disappearing when changing its contents
#self.preview.viewer.stopAnimating() #self.preview.viewer.stopAnimating()
@ -317,12 +327,16 @@ class SearchBox(QtGui.QLineEdit):
self.itemGroups = self.getItemGroups() self.itemGroups = self.getItemGroups()
self.filterModel(self.text()) self.filterModel(self.text())
def focusInEvent(self, qFocusEvent): def focusInEvent(self, qFocusEvent):
self.refreshItemGroups() global globalIgnoreFocusOut
if not globalIgnoreFocusOut:
self.refreshItemGroups()
self.showList() self.showList()
super(SearchBox, self).focusInEvent(qFocusEvent) super(SearchBox, self).focusInEvent(qFocusEvent)
def focusOutEvent(self, qFocusEvent): def focusOutEvent(self, qFocusEvent):
#self.hideList() global globalIgnoreFocusOut
super(SearchBox, self).focusOutEvent(qFocusEvent) if not globalIgnoreFocusOut:
self.hideList()
super(SearchBox, self).focusOutEvent(qFocusEvent)
def keyPressEvent(self, qKeyEvent): def keyPressEvent(self, qKeyEvent):
key = qKeyEvent.key() key = qKeyEvent.key()
listMovementKeys = { listMovementKeys = {