diff options
author | Florian Bruhin <me@the-compiler.org> | 2023-12-04 14:57:06 +0100 |
---|---|---|
committer | Florian Bruhin <me@the-compiler.org> | 2023-12-04 14:58:36 +0100 |
commit | c1a1a1377591874ade015bc0ed1318e79e465c36 (patch) | |
tree | ca6f53609356d92f49c9d72f86264d4e334cfd7c | |
parent | 8cd06741bb56cdca49f5cdc0542da97681154315 (diff) | |
download | qutebrowser-c1a1a1377591874ade015bc0ed1318e79e465c36.tar.gz qutebrowser-c1a1a1377591874ade015bc0ed1318e79e465c36.zip |
qtargs: Supply values with lambda instead of keys
Makes the lambdas more flexible, e.g. mapping a single key to a different flag depending on Chromium version. Ended up being unneeded for reading from canvas flag, but still useful.
-rw-r--r-- | qutebrowser/config/qtargs.py | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/qutebrowser/config/qtargs.py b/qutebrowser/config/qtargs.py index 4fa6aa43f..85f066ccb 100644 --- a/qutebrowser/config/qtargs.py +++ b/qutebrowser/config/qtargs.py @@ -282,7 +282,7 @@ _SettingValueType = Union[ [ version.WebEngineVersions, ], - str, + Optional[str], ], ] _WEBENGINE_SETTINGS: Dict[str, Dict[Any, Optional[_SettingValueType]]] = { @@ -336,9 +336,7 @@ _WEBENGINE_SETTINGS: Dict[str, Dict[Any, Optional[_SettingValueType]]] = { 'qt.workarounds.disable_accelerated_2d_canvas': { 'always': '--disable-accelerated-2d-canvas', 'never': None, - 'auto': lambda _versions: 'always' - if machinery.IS_QT6 - else 'never', + 'auto': '--disable-accelerated-2d-canvas' if machinery.IS_QT5 else None, }, } @@ -347,11 +345,7 @@ def _qtwebengine_settings_args(versions: version.WebEngineVersions) -> Iterator[ for setting, args in sorted(_WEBENGINE_SETTINGS.items()): arg = args[config.instance.get(setting)] if callable(arg): - new_value = arg(versions) - assert ( - new_value in args - ), f"qt.settings feature detection returned an unrecognized value: {new_value} for {setting}" - result = args[new_value] + result = arg(versions) if result is not None: assert isinstance( result, str |