rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Refactor _key_press from WebEngineScroller to WebEngineTab

Browse Source
This commit is contained in:
Jay Kamat 2017-05-08 22:49:14 -07:00
parent 5ba81e3611
commit 63cffaf558
No known key found for this signature in database
GPG Key ID: 5D2E399600F4F7B5
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
qutebrowser/browser/webengine/webenginetab.py
View File

@ -285,9 +285,9 @@ class WebEngineCaret(browsertab.AbstractCaret):
log.webview.debug("Clicking a searched link via fake key press.")
# send a fake enter, clicking the orange selection box
if not tab:
self._tab.scroller._key_press(Qt.Key_Enter)
self._tab.key_press(Qt.Key_Enter)
else:
self._tab.scroller._key_press(Qt.Key_Enter, modifier=Qt.ControlModifier)
self._tab.key_press(Qt.Key_Enter, modifier=Qt.ControlModifier)
else:
# click an existing blue selection
@ -311,14 +311,6 @@ class WebEngineScroller(browsertab.AbstractScroller):
page = widget.page()
page.scrollPositionChanged.connect(self._update_pos)
def _key_press(self, key, count=1, modifier=Qt.NoModifier):
for _ in range(min(count, 5000)):
press_evt = QKeyEvent(QEvent.KeyPress, key, modifier, 0, 0, 0)
release_evt = QKeyEvent(QEvent.KeyRelease, key, modifier,
0, 0, 0)
self._tab.send_event(press_evt)
self._tab.send_event(release_evt)
@pyqtSlot()
def _update_pos(self):
"""Update the scroll position attributes when it changed."""
@ -374,28 +366,28 @@ class WebEngineScroller(browsertab.AbstractScroller):
self._tab.run_js_async(js_code)
def up(self, count=1):
self._key_press(Qt.Key_Up, count)
self._tab.key_press(Qt.Key_Up, count)
def down(self, count=1):
self._key_press(Qt.Key_Down, count)
self._tab.key_press(Qt.Key_Down, count)
def left(self, count=1):
self._key_press(Qt.Key_Left, count)
self._tab.key_press(Qt.Key_Left, count)
def right(self, count=1):
self._key_press(Qt.Key_Right, count)
self._tab.key_press(Qt.Key_Right, count)
def top(self):
self._key_press(Qt.Key_Home)
self._tab.key_press(Qt.Key_Home)
def bottom(self):
self._key_press(Qt.Key_End)
self._tab.key_press(Qt.Key_End)
def page_up(self, count=1):
self._key_press(Qt.Key_PageUp, count)
self._tab.key_press(Qt.Key_PageUp, count)
def page_down(self, count=1):
self._key_press(Qt.Key_PageDown, count)
self._tab.key_press(Qt.Key_PageDown, count)
def at_top(self):
return self.pos_px().y() == 0
@ -655,6 +647,14 @@ class WebEngineTab(browsertab.AbstractTab):
def clear_ssl_errors(self):
raise browsertab.UnsupportedOperationError
def key_press(self, key, count=1, modifier=Qt.NoModifier):
for _ in range(min(count, 5000)):
press_evt = QKeyEvent(QEvent.KeyPress, key, modifier, 0, 0, 0)
release_evt = QKeyEvent(QEvent.KeyRelease, key, modifier,
0, 0, 0)
self.send_event(press_evt)
self.send_event(release_evt)
@pyqtSlot()
def _on_history_trigger(self):
url = self.url()