diff options
| author | Jimmy <jimmy@spalge.com> | 2021-10-03 17:09:16 +1300 |
|---|---|---|
| committer | Jimmy <jimmy@spalge.com> | 2021-10-03 17:09:16 +1300 |
| commit | b4d49deac795b95ff45901cf41beac04cd680276 (patch) | |
| tree | 51a6c93cded957f398d28e62a35264fdb06ae148 /qutebrowser | |
| parent | ab447bd396b46247f6f12b8e2c697b0f7e01b95a (diff) | |
| download | qutebrowser-b4d49deac795b95ff45901cf41beac04cd680276.tar.gz qutebrowser-b4d49deac795b95ff45901cf41beac04cd680276.zip | |
Make :search work
FindFlag doesn't work with int() either, use .value.
FindTextResult doesn't act like a bool, call `numberOfMatches()`.
Undo some disabled stuff that has been fixed upstream
Emit a bool, not the FindTextResult object.
Diffstat (limited to 'qutebrowser')
| -rw-r--r-- | qutebrowser/browser/commands.py | 2 | ||||
| -rw-r--r-- | qutebrowser/browser/webengine/webenginetab.py | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py index 42bd795a9..ec7bc00df 100644 --- a/qutebrowser/browser/commands.py +++ b/qutebrowser/browser/commands.py @@ -1545,7 +1545,7 @@ class CommandDispatcher: # :search-prev with reverse -> down going_up = options['reverse'] ^ prev - if found: + if found.numberOfMatches() > 0: # Check if the scroll position got smaller and show info. if not going_up and tab.scroller.pos_px().y() < old_scroll_pos.y(): message.info("Search hit BOTTOM, continuing at TOP") diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py index c6a8df141..e19bb0ccd 100644 --- a/qutebrowser/browser/webengine/webenginetab.py +++ b/qutebrowser/browser/webengine/webenginetab.py @@ -198,8 +198,8 @@ class WebEngineSearch(browsertab.AbstractSearch): self._wrap_handler = _WebEngineSearchWrapHandler() def _empty_flags(self): - return 0 - #return QWebEnginePage.FindFlag() # type: ignore[call-overload] + #return 0 + return QWebEnginePage.FindFlag(0) # type: ignore[call-overload] def connect_signals(self): self._wrap_handler.connect_signal(self._widget.page()) @@ -230,7 +230,7 @@ class WebEngineSearch(browsertab.AbstractSearch): found_text = 'found' if found else "didn't find" if flags: flag_text = 'with flags {}'.format(debug.qflags_key( - QWebEnginePage, flags, klass=QWebEnginePage.FindFlag)) + QWebEnginePage, flags.value, klass=QWebEnginePage.FindFlag)) else: flag_text = '' log.webview.debug(' '.join([caller, found_text, text, flag_text]) @@ -238,7 +238,7 @@ class WebEngineSearch(browsertab.AbstractSearch): if callback is not None: callback(found) - self.finished.emit(found) + self.finished.emit(found.numberOfMatches() > 0) self._widget.page().findText(text, flags, wrapped_callback) |