summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Bruhin <me@the-compiler.org>2018-09-28 18:16:42 +0200
committerFlorian Bruhin <me@the-compiler.org>2018-09-28 19:28:32 +0200
commit6d0d40878589a2c9f5bb90848cfd00ef9dd4035f (patch)
tree1c8ddc57c4ef66ba9f23320de49ef9a2c6623ba9
parent628e4e8692449ad61358f6f642073fc614ca47d5 (diff)
downloadqutebrowser-6d0d40878589a2c9f5bb90848cfd00ef9dd4035f.tar.gz
qutebrowser-6d0d40878589a2c9f5bb90848cfd00ef9dd4035f.zip
Use when-searching, not when_searching
-rw-r--r--qutebrowser/browser/shared.py2
-rw-r--r--qutebrowser/config/configdata.yml4
-rw-r--r--qutebrowser/config/configfiles.py2
3 files changed, 4 insertions, 4 deletions
diff --git a/qutebrowser/browser/shared.py b/qutebrowser/browser/shared.py
index 64fc9c508..eb222cbe8 100644
--- a/qutebrowser/browser/shared.py
+++ b/qutebrowser/browser/shared.py
@@ -284,7 +284,7 @@ def get_user_stylesheet(searching=False):
css += f.read()
if (config.val.scrolling.bar == 'never' or
- config.val.scrolling.bar == 'when_searching' and not searching):
+ config.val.scrolling.bar == 'when-searching' and not searching):
css += '\nhtml > ::-webkit-scrollbar { width: 0px; height: 0px; }'
return css
diff --git a/qutebrowser/config/configdata.yml b/qutebrowser/config/configdata.yml
index 1b7e26cc3..44c9f2e3d 100644
--- a/qutebrowser/config/configdata.yml
+++ b/qutebrowser/config/configdata.yml
@@ -1287,8 +1287,8 @@ scrolling.bar:
valid_values:
- always: Always show the scrollbar.
- never: Never show the scrollbar.
- - when_searching: Show the scrollbar when searching for text in the webpage.
- default: when_searching
+ - when-searching: Show the scrollbar when searching for text in the webpage.
+ default: when-searching
desc: When to show the scrollbar.
scrolling.smooth:
diff --git a/qutebrowser/config/configfiles.py b/qutebrowser/config/configfiles.py
index 4d5cb47f8..b4c8ea4ec 100644
--- a/qutebrowser/config/configfiles.py
+++ b/qutebrowser/config/configfiles.py
@@ -293,7 +293,7 @@ class YamlConfig(QObject):
self._migrate_bool(settings, 'tabs.favicons.show', 'always', 'never')
self._migrate_bool(settings, 'scrolling.bar',
- 'when_searching', 'never')
+ 'when-searching', 'never')
self._migrate_bool(settings, 'qt.force_software_rendering',
'software-opengl', 'none')