diff options
author | Florian Bruhin <me@the-compiler.org> | 2019-09-16 17:46:20 +0200 |
---|---|---|
committer | Florian Bruhin <me@the-compiler.org> | 2019-09-16 17:46:20 +0200 |
commit | 9019e35bceb3bc9133a5312df16915d65e2fdd4a (patch) | |
tree | 48d5ab9c68d5b5e9f6d593099cecc8aa1a82bd41 | |
parent | 660883ac8b0185086edec4da90f95877ad9c7200 (diff) | |
parent | 1864c05857197a8ea2c2b188e23d3be33b5f8620 (diff) | |
download | qutebrowser-9019e35bceb3bc9133a5312df16915d65e2fdd4a.tar.gz qutebrowser-9019e35bceb3bc9133a5312df16915d65e2fdd4a.zip |
Merge remote-tracking branch 'origin/pr/4712'
-rw-r--r-- | qutebrowser/browser/browsertab.py | 2 | ||||
-rw-r--r-- | qutebrowser/browser/shared.py | 18 | ||||
-rw-r--r-- | qutebrowser/mainwindow/statusbar/bar.py | 2 | ||||
-rw-r--r-- | qutebrowser/mainwindow/statusbar/url.py | 6 | ||||
-rw-r--r-- | qutebrowser/mainwindow/tabbedbrowser.py | 10 |
5 files changed, 22 insertions, 16 deletions
diff --git a/qutebrowser/browser/browsertab.py b/qutebrowser/browser/browsertab.py index 10f430e34..d9819e91f 100644 --- a/qutebrowser/browser/browsertab.py +++ b/qutebrowser/browser/browsertab.py @@ -781,7 +781,7 @@ class AbstractTabPrivate: def handle_auto_insert_mode(self, ok: bool) -> None: """Handle `input.insert_mode.auto_load` after loading finished.""" - if not config.val.input.insert_mode.auto_load or not ok: + if not ok or not config.cache['input.insert_mode.auto_load']: return cur_mode = self._mode_manager.mode diff --git a/qutebrowser/browser/shared.py b/qutebrowser/browser/shared.py index a6e616a46..8c4fe10d3 100644 --- a/qutebrowser/browser/shared.py +++ b/qutebrowser/browser/shared.py @@ -130,19 +130,21 @@ def javascript_alert(url, js_msg, abort_on, *, escape_msg=True): abort_on=abort_on, url=urlstr) +JS_LOGMAP = { + 'none': lambda arg: None, + 'debug': log.js.debug, + 'info': log.js.info, + 'warning': log.js.warning, + 'error': log.js.error, +} + + def javascript_log_message(level, source, line, msg): """Display a JavaScript log message.""" logstring = "[{}:{}] {}".format(source, line, msg) # Needs to line up with the values allowed for the # content.javascript.log setting. - logmap = { - 'none': lambda arg: None, - 'debug': log.js.debug, - 'info': log.js.info, - 'warning': log.js.warning, - 'error': log.js.error, - } - logger = logmap[config.val.content.javascript.log[level.name]] + logger = JS_LOGMAP[config.cache['content.javascript.log'][level.name]] logger(logstring) diff --git a/qutebrowser/mainwindow/statusbar/bar.py b/qutebrowser/mainwindow/statusbar/bar.py index 52da06572..42b3f4652 100644 --- a/qutebrowser/mainwindow/statusbar/bar.py +++ b/qutebrowser/mainwindow/statusbar/bar.py @@ -407,7 +407,7 @@ class StatusBar(QWidget): def minimumSizeHint(self): """Set the minimum height to the text height plus some padding.""" - padding = config.val.statusbar.padding + padding = config.cache['statusbar.padding'] width = super().minimumSizeHint().width() height = self.fontMetrics().height() + padding.top + padding.bottom return QSize(width, height) diff --git a/qutebrowser/mainwindow/statusbar/url.py b/qutebrowser/mainwindow/statusbar/url.py index a99c23529..6eace8822 100644 --- a/qutebrowser/mainwindow/statusbar/url.py +++ b/qutebrowser/mainwindow/statusbar/url.py @@ -101,6 +101,7 @@ class UrlText(textbase.TextBase): def _update_url(self): """Update the displayed URL if the url or the hover url changed.""" + old_urltype = self._urltype if self._hover_url is not None: self.setText(self._hover_url) self._urltype = UrlType.hover @@ -110,7 +111,10 @@ class UrlText(textbase.TextBase): else: self.setText('') self._urltype = UrlType.normal - config.set_register_stylesheet(self, update=False) + if old_urltype != self._urltype: + # We can avoid doing an unpolish here because the new style will + # always override the old one. + self.style().polish(self) @pyqtSlot(usertypes.LoadStatus) def on_load_status_changed(self, status): diff --git a/qutebrowser/mainwindow/tabbedbrowser.py b/qutebrowser/mainwindow/tabbedbrowser.py index b72984229..1ac96433f 100644 --- a/qutebrowser/mainwindow/tabbedbrowser.py +++ b/qutebrowser/mainwindow/tabbedbrowser.py @@ -594,7 +594,7 @@ class TabbedBrowser(QWidget): if tab.data.keep_icon: tab.data.keep_icon = False else: - if (config.val.tabs.tabs_are_windows and + if (config.cache['tabs.tabs_are_windows'] and tab.data.should_show_icon()): self.widget.window().setWindowIcon(self.default_window_icon) @@ -785,12 +785,12 @@ class TabbedBrowser(QWidget): # We can get signals for tabs we already deleted... return if ok: - start = config.val.colors.tabs.indicator.start - stop = config.val.colors.tabs.indicator.stop - system = config.val.colors.tabs.indicator.system + start = config.cache['colors.tabs.indicator.start'] + stop = config.cache['colors.tabs.indicator.stop'] + system = config.cache['colors.tabs.indicator.system'] color = utils.interpolate_color(start, stop, 100, system) else: - color = config.val.colors.tabs.indicator.error + color = config.cache['colors.tabs.indicator.error'] self.widget.set_tab_indicator_color(idx, color) if idx == self.widget.currentIndex(): tab.private_api.handle_auto_insert_mode(ok) |