From 51fcfa07b04c96705cde99fc9630b2e634f85fa1 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Mon, 1 Dec 2014 20:24:04 +0100
Subject: [PATCH] Fix setting ui->default-zoom to a level not in
 ui->zoom-levels.

Fixes #296.
See #115.
---
 qutebrowser/config/configdata.py  | 2 +-
 qutebrowser/config/configtypes.py | 8 --------
 qutebrowser/widgets/webview.py    | 4 ++--
 3 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/qutebrowser/config/configdata.py b/qutebrowser/config/configdata.py
index abacc46a0..16d196be3 100644
--- a/qutebrowser/config/configdata.py
+++ b/qutebrowser/config/configdata.py
@@ -196,7 +196,7 @@ DATA = collections.OrderedDict([
          "The available zoom levels, separated by commas."),
 
         ('default-zoom',
-         SettingValue(typ.ZoomPerc(), '100%'),
+         SettingValue(typ.Perc(), '100%'),
          "The default zoom level."),
 
         ('message-timeout',
diff --git a/qutebrowser/config/configtypes.py b/qutebrowser/config/configtypes.py
index 5242b2bc6..458487f7d 100644
--- a/qutebrowser/config/configtypes.py
+++ b/qutebrowser/config/configtypes.py
@@ -959,14 +959,6 @@ class ShellCommand(BaseType):
             return shlex.split(value)
 
 
-class ZoomPerc(Perc):
-
-    """A percentage which needs to be in the current zoom percentages."""
-
-    # FIXME we should validate the percentage is in the list here.
-    # https://github.com/The-Compiler/qutebrowser/issues/115
-
-
 class HintMode(BaseType):
 
     """Base class for the hints -> mode setting."""
diff --git a/qutebrowser/widgets/webview.py b/qutebrowser/widgets/webview.py
index 412310e50..31200380d 100644
--- a/qutebrowser/widgets/webview.py
+++ b/qutebrowser/widgets/webview.py
@@ -157,9 +157,9 @@ class WebView(QWebView):
     def init_neighborlist(self):
         """Initialize the _zoom neighborlist."""
         levels = config.get('ui', 'zoom-levels')
-        default = config.get('ui', 'default-zoom')
         self._zoom = usertypes.NeighborList(
-            levels, default, mode=usertypes.NeighborList.Modes.block)
+            levels, mode=usertypes.NeighborList.Modes.block)
+        self._zoom.fuzzyval = config.get('ui', 'default-zoom')
 
     def _mousepress_backforward(self, e):
         """Handle back/forward mouse button presses.