From f5d457e809562693e2fcf74492790cf0d0b3794d Mon Sep 17 00:00:00 2001 From: Klesh Wong Date: Fri, 29 Mar 2024 14:54:04 +0800 Subject: [PATCH] refactor: ratio always greater than 1 --- examples/wm.pyw | 6 +++--- src/jigsawwm/w32/monitor.py | 2 +- src/jigsawwm/wm/manager.py | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/examples/wm.pyw b/examples/wm.pyw index 1a05402..aa06461 100644 --- a/examples/wm.pyw +++ b/examples/wm.pyw @@ -23,13 +23,13 @@ wm = WindowManager( strict=True, gap=2, new_window_as_master=True, - affinity_index=lambda si: (5 if si.inch >= 24 else 0) + (5 if si.ratio < 2 else 0), + affinity_index=lambda si: (5 if si.inch >= 20 else 0) + (5 if si.ratio < 2 else 0), ), Theme( name="Mono", layout_tiler=tilers.mono_layout_tiler, strict=True, - affinity_index=lambda si: 10 if si.inch < 24 else 0, + affinity_index=lambda si: 10 if si.inch < 20 else 0, ), Theme( name="WideScreen Dwindle", @@ -38,7 +38,7 @@ wm = WindowManager( gap=2, strict=True, new_window_as_master=True, - affinity_index=lambda si: (5 if si.inch >= 24 else 0) + (5 if si.ratio > 2 else 0), + affinity_index=lambda si: (5 if si.inch >= 20 else 0) + (5 if si.ratio >= 2 else 0), ), ], ignore_exe_names=[ diff --git a/src/jigsawwm/w32/monitor.py b/src/jigsawwm/w32/monitor.py index 152603c..d360c93 100644 --- a/src/jigsawwm/w32/monitor.py +++ b/src/jigsawwm/w32/monitor.py @@ -178,7 +178,7 @@ def get_screen_info(self) -> screeninfo.Monitor: monitor.height, monitor.width_mm, monitor.height_mm, - ratio=monitor.width / monitor.height, + ratio=max(monitor.width, monitor.height) / min(monitor.width, monitor.height), is_primary=monitor.is_primary, inch=round(math.sqrt(monitor.width_mm ** 2 + monitor.height_mm ** 2) / 25.4), ) diff --git a/src/jigsawwm/wm/manager.py b/src/jigsawwm/wm/manager.py index 0d4055d..18f6f35 100644 --- a/src/jigsawwm/wm/manager.py +++ b/src/jigsawwm/wm/manager.py @@ -145,7 +145,7 @@ def _consume_sync_queue(self): traceback.print_exc() def _sync(self, init=False, restrict=False) -> bool: - logger.warning("_sync") + # logger.warning("_sync") virtdesk_state = self.virtdesk_state # gather all manageable windows manageable_windows = list(get_manageable_windows(self.check_force_managed))