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

Revert user-resize tracking, keep simple min/max constraints

Browse Source
This commit is contained in:
pax 2026-04-06 19:14:08 -05:00
parent c0a189192e
commit 4cf094f517
1 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
booru_viewer/gui/preview.py
View File

@ -172,7 +172,6 @@ class FullscreenPreview(QMainWindow):
if target_screen: if target_screen:
self.setScreen(target_screen) self.setScreen(target_screen)
self.setGeometry(target_screen.geometry()) self.setGeometry(target_screen.geometry())
self._user_resized = False
self._adjusting = False self._adjusting = False
# Restore saved state or start fullscreen # Restore saved state or start fullscreen
if FullscreenPreview._saved_geometry and not FullscreenPreview._saved_fullscreen: if FullscreenPreview._saved_geometry and not FullscreenPreview._saved_fullscreen:
@ -263,16 +262,14 @@ class FullscreenPreview(QMainWindow):
max_h = int(avail.height() * 0.85) # 15% margin top+bottom max_h = int(avail.height() * 0.85) # 15% margin top+bottom
else: else:
max_w = max_h = 9999 max_w = max_h = 9999
min_w = int(max_w * 0.45) if aspect >= 1 and not self._user_resized else 0 min_w = int(max_w * 0.45) if aspect >= 1 else 0 # landscape minimum
w = max(min(self.width(), max_w), min_w) w = max(min(self.width(), max_w), min_w)
new_h = int(w / aspect) new_h = int(w / aspect)
if new_h > max_h: if new_h > max_h:
new_h = max_h new_h = max_h
w = int(new_h * aspect) w = int(new_h * aspect)
self._adjusting = True
self.resize(w, new_h) self.resize(w, new_h)
self._hyprctl_resize(w, new_h) self._hyprctl_resize(w, new_h)
QTimer.singleShot(100, lambda: setattr(self, '_adjusting', False))
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."""
@ -454,16 +451,6 @@ class FullscreenPreview(QMainWindow):
def resizeEvent(self, event) -> None: def resizeEvent(self, event) -> None:
super().resizeEvent(event) super().resizeEvent(event)
# Detect user manual resize
if not self.isFullScreen() and not self._adjusting:
screen = self.screen()
if screen:
min_landscape = int(screen.availableGeometry().width() * 0.45)
if event.size().width() >= min_landscape:
# User stretched back to or beyond minimum — reset override
self._user_resized = False
else:
self._user_resized = True
# Position floating overlays # Position floating overlays
w = self.centralWidget().width() w = self.centralWidget().width()
h = self.centralWidget().height() h = self.centralWidget().height()