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

Ignore hints -> scatter for number hints

Browse Source 
See https://github.com/The-Compiler/qutebrowser/issues/308#issuecomment-167091450
This commit is contained in:
Florian Bruhin 2016-06-07 15:13:30 +02:00
parent 20636a2343
commit db0a67766d
6 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.asciidoc
View File

@ -65,6 +65,7 @@ Changed
- Number hints are now kept filtered after following a hint in rapid mode. - Number hints are now kept filtered after following a hint in rapid mode.
- Number hints are now renumbered after filtering - Number hints are now renumbered after filtering
- Number hints can now be filtered with multiple space-separated search terms - Number hints can now be filtered with multiple space-separated search terms
- `hints -> scatter` is now ignored for number hints
Fixed Fixed
----- -----

2
qutebrowser/browser/hints.py
View File

@ -223,7 +223,7 @@ class HintManager(QObject):
else: else:
chars = config.get('hints', 'chars') chars = config.get('hints', 'chars')
min_chars = config.get('hints', 'min-chars') min_chars = config.get('hints', 'min-chars')
if config.get('hints', 'scatter'): if config.get('hints', 'scatter') and hint_mode != 'number':
return self._hint_scattered(min_chars, chars, elems) return self._hint_scattered(min_chars, chars, elems)
else: else:
return self._hint_linear(min_chars, chars, elems) return self._hint_linear(min_chars, chars, elems)

2
qutebrowser/config/configdata.py
View File

@ -898,7 +898,7 @@ def data(readonly=False):
('scatter', ('scatter',
SettingValue(typ.Bool(), 'true'), SettingValue(typ.Bool(), 'true'),
"Whether to scatter hint key chains (like Vimium) or not (like " "Whether to scatter hint key chains (like Vimium) or not (like "
"dwb)."), "dwb). Ignored for number hints."),
('uppercase', ('uppercase',
SettingValue(typ.Bool(), 'false'), SettingValue(typ.Bool(), 'false'),

2
tests/end2end/data/hints/issue1186.html
View File

@ -10,7 +10,7 @@
</p> </p>
<p> <p>
This requires setting hints -&gt; mode to number, and hints -&gt; scatter to false. This requires setting hints -&gt; mode to number.
</p> </p>
<p> <p>

2
tests/end2end/data/hints/number.html
View File

@ -6,7 +6,7 @@
</head> </head>
<body> <body>
<p> <p>
This page contains various links to test numbered hints. This requires setting hints -> mode to number, and hints -> scatter to false. This page contains various links to test numbered hints. This requires setting hints -> mode to number.
</p> </p>
<p> <p>

9
tests/end2end/features/hints.feature
View File

@ -193,7 +193,6 @@ Feature: Using hints
Scenario: Keeping hints filter when using backspace Scenario: Keeping hints filter when using backspace
When I open data/hints/issue1186.html When I open data/hints/issue1186.html
And I set hints -> mode to number And I set hints -> mode to number
And I set hints -> scatter to false
And I run :hint all And I run :hint all
And I press the key "x" And I press the key "x"
And I press the key "0" And I press the key "0"
@ -210,3 +209,11 @@ Feature: Using hints
And I run :hint all And I run :hint all
And I press the keys "ten pos" And I press the keys "ten pos"
Then data/numbers/11.txt should be loaded Then data/numbers/11.txt should be loaded
Scenario: Scattering is ignored with number hints
When I open data/hints/number.html
And I set hints -> mode to number
And I set hints -> scatter to true
And I run :hint all
And I run :follow-hint 00
Then data/numbers/1.txt should be loaded