pax/booru-viewer
1
0
Fork 0
Code Issues Releases 18 Activity

Consolidate popout sizing into single _fit_to_content function

Browse Source
This commit is contained in:
pax 2026-04-06 19:23:42 -05:00
parent f2a85bb634
commit 37082a55c1
1 changed files with 18 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
booru_viewer/gui/preview.py
View File

@ -231,12 +231,12 @@ class FullscreenPreview(QMainWindow):
if not self.isFullScreen(): if not self.isFullScreen():
pix = self._viewer._pixmap pix = self._viewer._pixmap
if pix and not pix.isNull(): if pix and not pix.isNull():
self._adjust_to_aspect(pix.width(), pix.height()) self._fit_to_content(pix.width(), pix.height())
self._show_overlay() self._show_overlay()
def _on_video_size(self, w: int, h: int) -> None: def _on_video_size(self, w: int, h: int) -> None:
if not self.isFullScreen() and w > 0 and h > 0: if not self.isFullScreen() and w > 0 and h > 0:
self._adjust_to_aspect(w, h) self._fit_to_content(w, h)
def _is_hypr_floating(self) -> bool | None: def _is_hypr_floating(self) -> bool | None:
"""Check if this window is floating in Hyprland. None if not on Hyprland.""" """Check if this window is floating in Hyprland. None if not on Hyprland."""
@ -245,36 +245,24 @@ class FullscreenPreview(QMainWindow):
return None # not Hyprland return None # not Hyprland
return bool(win.get("floating")) return bool(win.get("floating"))
def _adjust_to_aspect(self, content_w: int, content_h: int) -> None: def _fit_to_content(self, content_w: int, content_h: int) -> None:
"""Resize windowed popout height to match content aspect ratio. Position untouched.""" """Size window to fit content. Width preserved, height from aspect ratio, clamped to screen."""
if self.isFullScreen() or content_w <= 0 or content_h <= 0: if self.isFullScreen() or content_w <= 0 or content_h <= 0:
return return
floating = self._is_hypr_floating() if self._is_hypr_floating() is False:
# On Hyprland tiled: skip resize entirely, just set the aspect lock prop self._hyprctl_resize(0, 0) # tiled: just set keep_aspect_ratio
if floating is False:
self._hyprctl_resize(0, 0) # only sets keep_aspect_ratio
return return
aspect = content_w / content_h aspect = content_w / content_h
screen = self.screen() screen = self.screen()
if screen: max_h = int(screen.availableGeometry().height() * 0.85) if screen else 9999
avail = screen.availableGeometry() max_w = screen.availableGeometry().width() if screen else 9999
max_w = avail.width() w = min(self.width(), max_w)
max_h = int(avail.height() * 0.85) # 15% margin top+bottom h = int(w / aspect)
else: if h > max_h:
max_w = max_h = 9999 h = max_h
w = self.width() w = int(h * aspect)
# If current width makes landscape content too small, scale up self.resize(w, h)
new_h = int(w / aspect) self._hyprctl_resize(w, h)
if aspect >= 1 and new_h < 250:
w = int(max_h * 0.5 * aspect)
new_h = int(w / aspect)
w = min(w, max_w)
new_h = int(w / aspect)
if new_h > max_h:
new_h = max_h
w = int(new_h * aspect)
self.resize(w, new_h)
self._hyprctl_resize(w, new_h)
def _show_overlay(self) -> None: def _show_overlay(self) -> None:
"""Show toolbar and video controls, restart auto-hide timer.""" """Show toolbar and video controls, restart auto-hide timer."""
@ -415,7 +403,7 @@ class FullscreenPreview(QMainWindow):
pass pass
def _exit_fullscreen(self) -> None: def _exit_fullscreen(self) -> None:
"""Leave fullscreen into an aspect-ratio-respecting window.""" """Leave fullscreen — sizes to content aspect ratio using current width."""
content_w, content_h = 0, 0 content_w, content_h = 0, 0
if self._stack.currentIndex() == 1: if self._stack.currentIndex() == 1:
mpv = self._video._mpv mpv = self._video._mpv
@ -430,29 +418,10 @@ class FullscreenPreview(QMainWindow):
pix = self._viewer._pixmap pix = self._viewer._pixmap
if pix and not pix.isNull(): if pix and not pix.isNull():
content_w, content_h = pix.width(), pix.height() content_w, content_h = pix.width(), pix.height()
screen = self.screen()
if content_w > 0 and content_h > 0 and screen:
avail = screen.availableGeometry()
max_w = int(avail.width() * 0.6)
max_h = int(avail.height() * 0.6)
aspect = content_w / content_h
if max_w / max_h > aspect:
win_h = max_h
win_w = int(win_h * aspect)
else:
win_w = max_w
win_h = int(win_w / aspect)
x = avail.x() + (avail.width() - win_w) // 2
y = avail.y() + (avail.height() - win_h) // 2
geo = self.geometry()
geo.setRect(x, y, win_w, win_h)
FullscreenPreview._saved_geometry = geo
FullscreenPreview._saved_fullscreen = False FullscreenPreview._saved_fullscreen = False
self.showNormal() self.showNormal()
if content_w > 0 and content_h > 0 and screen: if content_w > 0 and content_h > 0:
self.resize(win_w, win_h) self._fit_to_content(content_w, content_h)
self._hyprctl_resize(win_w, win_h)
def resizeEvent(self, event) -> None: def resizeEvent(self, event) -> None:
super().resizeEvent(event) super().resizeEvent(event)