From c7dcaff025f98aa72d428ee0c3a7844e0498d001 Mon Sep 17 00:00:00 2001 From: Martin Tournoij Date: Fri, 29 May 2015 18:35:15 +0200 Subject: [PATCH] Add navigate option to scroll_page() So you can scroll down & navigate when you're at the bottom. To bind this to space: scroll-page 0 1 next Not sure if it's a good idea to bind this by default? May surprise some people... See #696 --- qutebrowser/browser/commands.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py index 0c01260d7..8c29ad317 100644 --- a/qutebrowser/browser/commands.py +++ b/qutebrowser/browser/commands.py @@ -643,14 +643,23 @@ class CommandDispatcher: @cmdutils.register(instance='command-dispatcher', hide=True, scope='window', count='count') - def scroll_page(self, x: {'type': float}, y: {'type': float}, count=1): + def scroll_page(self, x: {'type': float}, y: {'type': float}, + navigate=None, count=1): """Scroll the frame page-wise. Args: x: How many pages to scroll to the right. y: How many pages to scroll down. + navigate: :navigate to the next page on bottom count: multiplier """ + frame = self._current_widget().page().currentFrame() + if (navigate is not None and + frame.scrollPosition().y() >= + frame.scrollBarMaximum(Qt.Vertical)): + self.navigate(navigate) + return + mult_x = count * x mult_y = count * y if mult_y.is_integer(): @@ -663,7 +672,6 @@ class CommandDispatcher: mult_y = 0 if mult_x == 0 and mult_y == 0: return - frame = self._current_widget().page().currentFrame() size = frame.geometry() dx = mult_x * size.width() dy = mult_y * size.height()