Be even more specific on what widget to return focus to after searching next document
This commit is contained in:
@@ -1326,7 +1326,7 @@ class GuiDocEditor(QPlainTextEdit):
|
|||||||
self.beginSearch()
|
self.beginSearch()
|
||||||
return
|
return
|
||||||
|
|
||||||
rFocus = self.docSearch.searchBox if self.docSearch.anyFocus() else self
|
prevFocus = QApplication.focusWidget() or self
|
||||||
resS, resE = self.findAllOccurences()
|
resS, resE = self.findAllOccurences()
|
||||||
if len(resS) == 0 and self._docHandle:
|
if len(resS) == 0 and self._docHandle:
|
||||||
self.docSearch.setResultCount(0, 0)
|
self.docSearch.setResultCount(0, 0)
|
||||||
@@ -1335,7 +1335,7 @@ class GuiDocEditor(QPlainTextEdit):
|
|||||||
self.requestNextDocument.emit(self._docHandle, CONFIG.searchLoop)
|
self.requestNextDocument.emit(self._docHandle, CONFIG.searchLoop)
|
||||||
QApplication.processEvents()
|
QApplication.processEvents()
|
||||||
self.beginSearch()
|
self.beginSearch()
|
||||||
rFocus.setFocus()
|
prevFocus.setFocus()
|
||||||
return
|
return
|
||||||
|
|
||||||
cursor = self.textCursor()
|
cursor = self.textCursor()
|
||||||
@@ -1355,7 +1355,7 @@ class GuiDocEditor(QPlainTextEdit):
|
|||||||
self.requestNextDocument.emit(self._docHandle, CONFIG.searchLoop)
|
self.requestNextDocument.emit(self._docHandle, CONFIG.searchLoop)
|
||||||
QApplication.processEvents()
|
QApplication.processEvents()
|
||||||
self.beginSearch()
|
self.beginSearch()
|
||||||
rFocus.setFocus()
|
prevFocus.setFocus()
|
||||||
return
|
return
|
||||||
else:
|
else:
|
||||||
resIdx = 0 if doLoop else maxIdx
|
resIdx = 0 if doLoop else maxIdx
|
||||||
|
|||||||
Reference in New Issue
Block a user