Improve wheel navigation and zoom controls

This commit is contained in:
2026-06-29 22:06:57 +08:00
parent 6469a39cf7
commit a8d8885a3f
4 changed files with 103 additions and 10 deletions
+68 -7
View File
@@ -3,7 +3,7 @@ from __future__ import annotations
from dataclasses import dataclass
from pathlib import Path
from PySide6.QtCore import QSettings, QStandardPaths, Qt, QUrl
from PySide6.QtCore import QSignalBlocker, QSettings, QStandardPaths, Qt, QUrl
from PySide6.QtGui import QAction, QDesktopServices, QIcon, QKeySequence, QPainter
from PySide6.QtPrintSupport import QPrintDialog, QPrinter
from PySide6.QtWidgets import (
@@ -22,6 +22,8 @@ from PySide6.QtWidgets import (
QMenu,
QMessageBox,
QSplitter,
QSlider,
QSpinBox,
QStatusBar,
QTabWidget,
QToolBar,
@@ -125,6 +127,7 @@ class MainWindow(QMainWindow):
session.viewer.page_changed.connect(lambda _: self._update_status())
session.viewer.page_changed.connect(lambda _: self._refresh_session_raster_overlays())
session.viewer.zoom_changed.connect(lambda _: self._update_status())
session.viewer.zoom_changed.connect(lambda zoom, watched=session: self._sync_zoom_controls(zoom, watched))
session.viewer.ink_stroke_finished.connect(self.add_ink_stroke)
session.viewer.placement_requested.connect(self.place_pending_object)
session.viewer.object_select_requested.connect(self.select_object_at_point)
@@ -154,6 +157,7 @@ class MainWindow(QMainWindow):
if self.tab_widget.currentIndex() != index:
self.tab_widget.setCurrentIndex(index)
self._refresh_session_raster_overlays()
self._sync_zoom_controls(self.viewer.zoom)
self._update_title()
self._update_status()
@@ -216,6 +220,44 @@ class MainWindow(QMainWindow):
return False
return True
def previous_page(self) -> None:
self.viewer.previous_page()
def next_page(self) -> None:
self.viewer.next_page()
def zoom_in(self) -> None:
self.viewer.zoom_in()
def zoom_out(self) -> None:
self.viewer.zoom_out()
def fit_width(self) -> None:
self.viewer.fit_width()
def fit_page(self) -> None:
self.viewer.fit_page()
def set_zoom_percent(self, value: int) -> None:
if not self.document.is_open:
self._sync_zoom_controls(self.viewer.zoom)
return
self.viewer.set_zoom(value / 100)
def _sync_zoom_controls(
self,
zoom: float,
watched: DocumentSession | None = None,
) -> None:
if not hasattr(self, "zoom_slider"):
return
if watched is not None and watched is not self._current_session():
return
percent = max(25, min(400, round(zoom * 100)))
with QSignalBlocker(self.zoom_slider), QSignalBlocker(self.zoom_percent_input):
self.zoom_slider.setValue(percent)
self.zoom_percent_input.setValue(percent)
def offer_restore_last_file(self) -> None:
last_file = self.settings.value("lastOpenFile", "", str)
if not last_file or self.document.is_open or not Path(last_file).exists():
@@ -858,6 +900,18 @@ class MainWindow(QMainWindow):
self.zoom_out_action.setShortcut(QKeySequence.StandardKey.ZoomOut)
self.zoom_in_action = QAction("放大", self)
self.zoom_in_action.setShortcut(QKeySequence.StandardKey.ZoomIn)
self.zoom_slider = QSlider(Qt.Orientation.Horizontal)
self.zoom_slider.setRange(25, 400)
self.zoom_slider.setSingleStep(5)
self.zoom_slider.setPageStep(25)
self.zoom_slider.setFixedWidth(150)
self.zoom_slider.setToolTip("缩放")
self.zoom_percent_input = QSpinBox()
self.zoom_percent_input.setRange(25, 400)
self.zoom_percent_input.setSingleStep(5)
self.zoom_percent_input.setSuffix("%")
self.zoom_percent_input.setFixedWidth(78)
self.zoom_percent_input.setToolTip("缩放百分比")
self.fit_width_action = QAction("适应宽度", self)
self.fit_page_action = QAction("适应页面", self)
self.go_to_page_action = QAction("跳转", self)
@@ -1073,6 +1127,11 @@ class MainWindow(QMainWindow):
self.next_action,
self.zoom_out_action,
self.zoom_in_action,
]:
toolbar.addAction(action)
toolbar.addWidget(self.zoom_slider)
toolbar.addWidget(self.zoom_percent_input)
for action in [
self.fit_width_action,
self.fit_page_action,
self.go_to_page_action,
@@ -1113,12 +1172,14 @@ class MainWindow(QMainWindow):
self.about_action.triggered.connect(self.show_about)
self.undo_action.triggered.connect(self.undo)
self.redo_action.triggered.connect(self.redo)
self.previous_action.triggered.connect(self.viewer.previous_page)
self.next_action.triggered.connect(self.viewer.next_page)
self.zoom_out_action.triggered.connect(self.viewer.zoom_out)
self.zoom_in_action.triggered.connect(self.viewer.zoom_in)
self.fit_width_action.triggered.connect(self.viewer.fit_width)
self.fit_page_action.triggered.connect(self.viewer.fit_page)
self.previous_action.triggered.connect(self.previous_page)
self.next_action.triggered.connect(self.next_page)
self.zoom_out_action.triggered.connect(self.zoom_out)
self.zoom_in_action.triggered.connect(self.zoom_in)
self.zoom_slider.valueChanged.connect(self.set_zoom_percent)
self.zoom_percent_input.valueChanged.connect(self.set_zoom_percent)
self.fit_width_action.triggered.connect(self.fit_width)
self.fit_page_action.triggered.connect(self.fit_page)
self.go_to_page_action.triggered.connect(self.go_to_page_dialog)
self.rotate_action.triggered.connect(self.rotate_page)
self.delete_action.triggered.connect(self.delete_page)
+32 -2
View File
@@ -1,7 +1,7 @@
from __future__ import annotations
from PySide6.QtCore import QPointF, QRectF, Qt, Signal
from PySide6.QtGui import QContextMenuEvent, QMouseEvent, QPainter, QPen, QPixmap
from PySide6.QtGui import QContextMenuEvent, QMouseEvent, QPainter, QPen, QPixmap, QWheelEvent
from PySide6.QtWidgets import QLabel, QScrollArea, QSizePolicy
from pdfreaderlite.core.document import PdfDocument
@@ -98,6 +98,9 @@ class PageLabel(QLabel):
return
super().contextMenuEvent(event)
def wheelEvent(self, event: QWheelEvent) -> None:
event.ignore()
def paintEvent(self, event) -> None:
super().paintEvent(event)
painter = QPainter(self)
@@ -207,9 +210,36 @@ class PdfViewer(QScrollArea):
self.set_zoom(max(0.25, self.zoom - 0.15))
def set_zoom(self, zoom: float) -> None:
self.zoom = zoom
self.zoom = max(0.25, min(4.0, zoom))
self.render()
def wheelEvent(self, event: QWheelEvent) -> None:
if event.modifiers() & Qt.KeyboardModifier.ControlModifier:
if event.angleDelta().y() > 0:
self.zoom_in()
else:
self.zoom_out()
event.accept()
return
delta = event.angleDelta().y()
bar = self.verticalScrollBar()
at_top = bar.value() <= bar.minimum()
at_bottom = bar.value() >= bar.maximum()
if delta < 0 and at_bottom and self.document and self.page_index < self.document.page_count - 1:
self.page_index += 1
self.render()
self.verticalScrollBar().setValue(self.verticalScrollBar().minimum())
event.accept()
return
if delta > 0 and at_top and self.document and self.page_index > 0:
self.page_index -= 1
self.render()
self.verticalScrollBar().setValue(self.verticalScrollBar().maximum())
event.accept()
return
super().wheelEvent(event)
def set_drawing_enabled(self, enabled: bool) -> None:
if enabled:
self.set_placement_enabled(False)