Merge branch 'scroll' of https://github.com/blyxxyz/qutebrowser into blyxxyz-scroll

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