From c7dcaff025f98aa72d428ee0c3a7844e0498d001 Mon Sep 17 00:00:00 2001 From: Martin Tournoij Date: Fri, 29 May 2015 18:35:15 +0200 Subject: [PATCH 1/4] 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() From 8c80f99a32363ebc2b139e7c0074e4c165d992b3 Mon Sep 17 00:00:00 2001 From: Martin Tournoij Date: Fri, 29 May 2015 21:18:44 +0200 Subject: [PATCH 2/4] Improve navigate option to scroll_page() --- qutebrowser/browser/commands.py | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py index 8c29ad317..735deba47 100644 --- a/qutebrowser/browser/commands.py +++ b/qutebrowser/browser/commands.py @@ -643,21 +643,27 @@ class CommandDispatcher: @cmdutils.register(instance='command-dispatcher', hide=True, scope='window', count='count') - def scroll_page(self, x: {'type': float}, y: {'type': float}, - navigate=None, count=1): + def scroll_page(self, x: {'type': float}, y: {'type': float}, *, + top_navigate: {'type': ('prev', 'decrement')}=None, + bottom_navigate: {'type': ('next', 'increment')}=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 + bottom_navigate: :navigate to the next page on bottom + top_navigate: :navigate to the previous page on top count: multiplier """ frame = self._current_widget().page().currentFrame() - if (navigate is not None and + if (bottom_navigate is not None and frame.scrollPosition().y() >= frame.scrollBarMaximum(Qt.Vertical)): - self.navigate(navigate) + self.navigate(bottom_navigate) + return + elif top_navigate is not None and frame.scrollPosition().y() == 0: + self.navigate(top_navigate) return mult_x = count * x From 9c99c22f1b4edee2d43efe2365beca34a275fbd9 Mon Sep 17 00:00:00 2001 From: Martin Tournoij Date: Fri, 29 May 2015 23:49:48 +0200 Subject: [PATCH 3/4] Fix issue #701 --- qutebrowser/browser/commands.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py index 735deba47..337823122 100644 --- a/qutebrowser/browser/commands.py +++ b/qutebrowser/browser/commands.py @@ -657,6 +657,9 @@ class CommandDispatcher: count: multiplier """ frame = self._current_widget().page().currentFrame() + if not frame.url().isValid() == '': # Issue 701 + return + if (bottom_navigate is not None and frame.scrollPosition().y() >= frame.scrollBarMaximum(Qt.Vertical)): From 70956aaeca3df4bf0c9842fe443202370f683ff8 Mon Sep 17 00:00:00 2001 From: Martin Tournoij Date: Fri, 29 May 2015 23:57:57 +0200 Subject: [PATCH 4/4] oops --- qutebrowser/browser/commands.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py index 337823122..5318bdc7d 100644 --- a/qutebrowser/browser/commands.py +++ b/qutebrowser/browser/commands.py @@ -657,7 +657,7 @@ class CommandDispatcher: count: multiplier """ frame = self._current_widget().page().currentFrame() - if not frame.url().isValid() == '': # Issue 701 + if not frame.url().isValid(): # Issue 701 return if (bottom_navigate is not None and