From b2796d4a85920f9c7463c4f7c2ec6d1f2ce5e0c4 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Thu, 29 Nov 2018 19:26:05 +0100 Subject: [PATCH] Rename some AbstractZoom methods --- qutebrowser/browser/browsertab.py | 10 +++++----- qutebrowser/browser/commands.py | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/qutebrowser/browser/browsertab.py b/qutebrowser/browser/browsertab.py index ed07bd27c..2fb247a39 100644 --- a/qutebrowser/browser/browsertab.py +++ b/qutebrowser/browser/browsertab.py @@ -381,7 +381,7 @@ class AbstractZoom(QObject): levels, mode=usertypes.NeighborList.Modes.edge) self._neighborlist.fuzzyval = config.val.zoom.default - def offset(self, offset: int) -> None: + def apply_offset(self, offset: int) -> None: """Increase/Decrease the zoom level by the given offset. Args: @@ -418,10 +418,10 @@ class AbstractZoom(QObject): def factor(self) -> float: return self._zoom_factor - def set_default(self) -> None: + def apply_default(self) -> None: self._set_factor_internal(float(config.val.zoom.default) / 100) - def set_current(self) -> None: + def reapply(self) -> None: self._set_factor_internal(self._zoom_factor) @@ -888,7 +888,7 @@ class AbstractTab(QWidget): self.settings._settings = widget.settings() self._install_event_filter() - self.zoom.set_default() + self.zoom.apply_default() def _install_event_filter(self) -> None: raise NotImplementedError @@ -1003,7 +1003,7 @@ class AbstractTab(QWidget): if not self.title(): self.title_changed.emit(self.url().toDisplayString()) - self.zoom.set_current() + self.zoom.reapply() @pyqtSlot() def _on_history_trigger(self) -> None: diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py index 9ad5e0011..56a951a9f 100644 --- a/qutebrowser/browser/commands.py +++ b/qutebrowser/browser/commands.py @@ -901,7 +901,7 @@ class CommandDispatcher: """ tab = self._current_widget() try: - perc = tab.zoom.offset(count) + perc = tab.zoom.apply_offset(count) except ValueError as e: raise cmdutils.CommandError(e) if not quiet: @@ -918,7 +918,7 @@ class CommandDispatcher: """ tab = self._current_widget() try: - perc = tab.zoom.offset(-count) + perc = tab.zoom.apply_offset(-count) except ValueError as e: raise cmdutils.CommandError(e) if not quiet: