From df670bd840250e3368b1b9bed89591d72a219b39 Mon Sep 17 00:00:00 2001 From: herr kaste Date: Thu, 15 Jul 2021 22:11:47 +0200 Subject: [PATCH] Fix fallback logic for view settings (#166) --- origami.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/origami.py b/origami.py index 74eb694..e456e97 100644 --- a/origami.py +++ b/origami.py @@ -761,8 +761,9 @@ def on_close(self, view): def on_pre_close(self, view): # Read from global settings for backward compatibility - auto_close = view.settings().get("origami_auto_close_empty_panes", False) - auto_close = self.settings().get("auto_close_empty_panes", auto_close) + auto_close = view.settings().get("origami_auto_close_empty_panes") + if auto_close is None: + auto_close = self.settings().get("auto_close_empty_panes") if not auto_close: return @@ -810,8 +811,9 @@ def on_activated(self, view): if self.running: return # Read from global settings for backward compatibility - fraction = view.settings().get("origami_auto_zoom_on_focus", False) - fraction = self.settings().get("auto_zoom_on_focus", fraction) + fraction = view.settings().get("origami_auto_zoom_on_focus") + if fraction is None: + fraction = self.settings().get("auto_zoom_on_focus") if not fraction: return if view.settings().get("is_widget"):