Reproog/novelWriter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix focus after search goes to next document

Browse Source
This commit is contained in:
Veronica Berglyd Olsen
2025-01-22 22:20:46 +01:00
parent 34645be975
commit a8116a0fd9
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
novelwriter/gui/doceditor.py
+6 -4
View File
@@ -100,6 +100,7 @@ class GuiDocEditor(QPlainTextEdit):
Qt.Key.Key_Left, Qt.Key.Key_Right, Qt.Key.Key_Up, Qt.Key.Key_Down, Qt.Key.Key_Left, Qt.Key.Key_Right, Qt.Key.Key_Up, Qt.Key.Key_Down,
Qt.Key.Key_PageUp, Qt.Key.Key_PageDown Qt.Key.Key_PageUp, Qt.Key.Key_PageDown
) )
ENTER_KEYS = (Qt.Key.Key_Return, Qt.Key.Key_Enter)
# Custom Signals # Custom Signals
closeEditorRequest = pyqtSignal() closeEditorRequest = pyqtSignal()
@@ -927,7 +928,7 @@ class GuiDocEditor(QPlainTextEdit):
* We also handle automatic scrolling here. * We also handle automatic scrolling here.
""" """
self._lastActive = time() self._lastActive = time()
if self.docSearch.anyFocus() and event.key() in (Qt.Key.Key_Return, Qt.Key.Key_Enter): if self.docSearch.anyFocus() and event.key() in self.ENTER_KEYS:
return return
elif event == QKeySequence.StandardKey.Redo: elif event == QKeySequence.StandardKey.Redo:
self.docAction(nwDocAction.REDO) self.docAction(nwDocAction.REDO)
@@ -1325,6 +1326,7 @@ class GuiDocEditor(QPlainTextEdit):
self.beginSearch() self.beginSearch()
return return
rFocus = self.docSearch.searchBox if self.docSearch.anyFocus() else 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)
@@ -1333,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()
self.setFocus() rFocus.setFocus()
return return
cursor = self.textCursor() cursor = self.textCursor()
@@ -1353,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()
self.setFocus() rFocus.setFocus()
return return
else: else:
resIdx = 0 if doLoop else maxIdx resIdx = 0 if doLoop else maxIdx
@@ -2705,7 +2707,7 @@ class GuiDocEditSearch(QFrame):
def anyFocus(self) -> bool: def anyFocus(self) -> bool:
"""Return True if any of the input boxes have focus.""" """Return True if any of the input boxes have focus."""
return self.searchBox.hasFocus() or self.replaceBox.hasFocus() return self.hasFocus() or self.isAncestorOf(QApplication.focusWidget())
## ##
# Public Slots # Public Slots