diff options
| -rw-r--r-- | qutebrowser/config/configtypes.py | 5 | ||||
| -rw-r--r-- | tests/unit/config/test_configinit.py | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/qutebrowser/config/configtypes.py b/qutebrowser/config/configtypes.py index 7c68ae964..4c2d458c3 100644 --- a/qutebrowser/config/configtypes.py +++ b/qutebrowser/config/configtypes.py @@ -1333,7 +1333,10 @@ class QtFont(Font): if size == 'default_size': size = self.default_size - if size.lower().endswith('pt'): + if size is None: + # initial validation before default_size is set up. + pass + elif size.lower().endswith('pt'): font.setPointSizeF(float(size[:-2])) elif size.lower().endswith('px'): font.setPixelSize(int(size[:-2])) diff --git a/tests/unit/config/test_configinit.py b/tests/unit/config/test_configinit.py index f461e4012..2063f6c13 100644 --- a/tests/unit/config/test_configinit.py +++ b/tests/unit/config/test_configinit.py @@ -41,7 +41,7 @@ def init_patch(qapp, fake_save_manager, monkeypatch, config_tmpdir, monkeypatch.setattr(config, 'change_filters', []) monkeypatch.setattr(configinit, '_init_errors', None) monkeypatch.setattr(configtypes.Font, 'default_family', None) - monkeypatch.setattr(configtypes.Font, 'default_size', '10pt') + monkeypatch.setattr(configtypes.Font, 'default_size', None) yield try: objreg.delete('config-commands') @@ -356,6 +356,7 @@ class TestLateInit: """Ensure setting fonts.default_family at init works properly. See https://github.com/qutebrowser/qutebrowser/issues/2973 + and https://github.com/qutebrowser/qutebrowser/issues/5223 """ if method == 'temp': args.temp_settings = settings |