Merge branch 'blyxxyz-scroll'

CHANGELOG.asciidoc

@@ -22,6 +22,12 @@ Added
 
 - New `{host}` replacement for tab- and window titles which evaluates to the current host.
 
+Changed
+~~~~~~~
+
+- `:scroll-perc` now prefers a count over the argument given to it, which means
+  `gg` can be used with a count.
+
 v0.7.0
 ------
 

README.asciidoc

@@ -185,6 +185,7 @@ Contributors, sorted by the number of commits in descending order:
 * Nick Ginther
 * Michael Ilsaas
 * Martin Zimmermann
+* Jan Verbeek
 * Fritz Reichwald
 * Brian Jackson
 * sbinix
@@ -204,7 +205,6 @@ Contributors, sorted by the number of commits in descending order:
 * Regina Hug
 * Mathias Fussenegger
 * Marcelo Santos
-* Jan Verbeek
 * Fritz V155 Reichwald
 * Franz Fellner
 * zwarag

qutebrowser/browser/commands.py

@@ -600,7 +600,7 @@ class CommandDispatcher:
 
         if perc is None and count is None:
             perc = 100
-        elif perc is None:
+        elif count is not None:
             perc = count
 
         orientation = Qt.Horizontal if horizontal else Qt.Vertical

tests/end2end/features/scroll.feature

@@ -190,6 +190,10 @@ Feature: Scrolling
         And I run :scroll-perc 20
         Then no crash should happen
 
+    Scenario: :scroll-perc with count and argument
+        When I run :scroll-perc 0 with count 50
+        Then the page should be scrolled vertically
+
     ## :scroll-page
 
     Scenario: Scrolling down with :scroll-page