From 315ed519eee40f800ac619197ffecc72f4fc690d Mon Sep 17 00:00:00 2001 From: Jay Kamat Date: Sun, 10 Jun 2018 16:27:56 -0700 Subject: [PATCH] Use ctrl-enter in all cases --- qutebrowser/browser/webengine/webenginetab.py | 6 ++++-- qutebrowser/browser/webkit/webkittab.py | 8 ++++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py index 0a8e62ecd..3ea3079aa 100644 --- a/qutebrowser/browser/webengine/webenginetab.py +++ b/qutebrowser/browser/webengine/webenginetab.py @@ -337,8 +337,10 @@ class WebEngineCaret(browsertab.AbstractCaret): return if js_elem == "focused": # we had a focused element, not a selected one. Just send - self._tab.key_press(Qt.Key_Enter) - return + if tab: + self._tab.key_press(Qt.Key_Enter, modifier=Qt.ControlModifier) + else: + self._tab.key_press(Qt.Key_Enter) assert isinstance(js_elem, dict), js_elem elem = webengineelem.WebEngineElement(js_elem, tab=self._tab) diff --git a/qutebrowser/browser/webkit/webkittab.py b/qutebrowser/browser/webkit/webkittab.py index 67f04886f..36da17dac 100644 --- a/qutebrowser/browser/webkit/webkittab.py +++ b/qutebrowser/browser/webkit/webkittab.py @@ -389,10 +389,14 @@ class WebKitCaret(browsertab.AbstractCaret): selection = self._widget.selectedHtml() if not selection: # Getting here may mean we crashed, but we can't do anything - # about that: + # about that until this commit is released: # https://github.com/annulen/webkit/commit/0e75f3272d149bc64899c161f150eb341a2417af # TODO find a way to check if something is focused - self._tab.key_press(Qt.Key_Enter) + if tab: + self._tab.key_press(Qt.Key_Enter, + modifier=Qt.ControlModifier) + else: + self._tab.key_press(Qt.Key_Enter) return try: selected_element = xml.etree.ElementTree.fromstring(