Adjust zoom status range and spacing

This commit is contained in:
2026-06-30 10:02:12 +08:00
parent d5796be29d
commit 02e556a4e9
4 changed files with 19 additions and 13 deletions
+1 -1
View File
@@ -9,7 +9,7 @@ PDFReaderLite 是一个面向 Windows 的轻量 PDF 阅读与编辑工具,目
- 连续阅读模式,页面上下自动衔接并保留页间缝隙 - 连续阅读模式,页面上下自动衔接并保留页间缝隙
- 鼠标滚轮优先在文档内容窗口内上下滚动 - 鼠标滚轮优先在文档内容窗口内上下滚动
- 键盘左右键翻页,上下键滚动阅读区 - 键盘左右键翻页,上下键滚动阅读区
- 状态栏三段式页面显示区:页码输入、对数型缩放滑条与 10%-1000% 缩放文本框、适应宽度/适应页面 - 状态栏三段式页面显示区:页码输入、对数型缩放滑条与 20%-300% 缩放文本框、适应宽度/适应页面
- 适应宽度、适应页面 - 适应宽度、适应页面
- 页码跳转(已支持状态栏页码输入框,失焦后自动跳转并校验非法输入) - 页码跳转(已支持状态栏页码输入框,失焦后自动跳转并校验非法输入)
- 左侧缩略图 - 左侧缩略图
+1 -1
View File
@@ -7,7 +7,7 @@ PDFReaderLite 是 Windows 平台的轻量 PDF 阅读与编辑工具。功能重
## V1:基础可用版 ## V1:基础可用版
- 打开 PDF - 打开 PDF
- 阅读、翻页、缩放(已支持连续阅读、页间缝隙、鼠标滚轮页内/文档内滚动、键盘左右翻页、键盘上下滚动、状态栏三段式页面控件、对数型缩放滑条,缩放范围 10%-1000%) - 阅读、翻页、缩放(已支持连续阅读、页间缝隙、鼠标滚轮页内/文档内滚动、键盘左右翻页、键盘上下滚动、状态栏三段式页面控件、对数型缩放滑条,缩放范围 20%-300%)
- 适应宽度、适应页面 - 适应宽度、适应页面
- 页码跳转(已支持状态栏无上下按钮页码输入框,失焦后自动跳转并校验非法输入) - 页码跳转(已支持状态栏无上下按钮页码输入框,失焦后自动跳转并校验非法输入)
- 左侧缩略图 - 左侧缩略图
+14 -8
View File
@@ -291,11 +291,17 @@ class MainWindow(QMainWindow):
self.viewer.set_zoom(self._zoom_from_slider_value(value)) self.viewer.set_zoom(self._zoom_from_slider_value(value))
def _slider_value_from_zoom(self, zoom: float) -> int: def _slider_value_from_zoom(self, zoom: float) -> int:
clamped_zoom = max(0.1, min(10.0, zoom)) min_zoom = 0.2
return round((math.log10(clamped_zoom) + 1.0) * 1000) max_zoom = 3.0
clamped_zoom = max(min_zoom, min(max_zoom, zoom))
span = math.log10(max_zoom) - math.log10(min_zoom)
return round(((math.log10(clamped_zoom) - math.log10(min_zoom)) / span) * 2000)
def _zoom_from_slider_value(self, value: int) -> float: def _zoom_from_slider_value(self, value: int) -> float:
exponent = (value / 1000) - 1.0 min_zoom = 0.2
max_zoom = 3.0
span = math.log10(max_zoom) - math.log10(min_zoom)
exponent = math.log10(min_zoom) + (value / 2000) * span
return 10**exponent return 10**exponent
def apply_zoom_percent_input(self) -> None: def apply_zoom_percent_input(self) -> None:
@@ -308,7 +314,7 @@ class MainWindow(QMainWindow):
except ValueError: except ValueError:
self._sync_zoom_controls(self.viewer.zoom) self._sync_zoom_controls(self.viewer.zoom)
return return
if 10 <= percent <= 1000: if 20 <= percent <= 300:
self.viewer.set_zoom(percent / 100) self.viewer.set_zoom(percent / 100)
self._sync_zoom_controls(self.viewer.zoom) self._sync_zoom_controls(self.viewer.zoom)
@@ -321,7 +327,7 @@ class MainWindow(QMainWindow):
return return
if watched is not None and watched is not self._current_session(): if watched is not None and watched is not self._current_session():
return return
percent = max(10, min(1000, round(zoom * 100))) percent = max(20, min(300, round(zoom * 100)))
with QSignalBlocker(self.zoom_slider), QSignalBlocker(self.zoom_percent_input): with QSignalBlocker(self.zoom_slider), QSignalBlocker(self.zoom_percent_input):
self.zoom_slider.setValue(self._slider_value_from_zoom(zoom)) self.zoom_slider.setValue(self._slider_value_from_zoom(zoom))
self.zoom_percent_input.setText(str(percent)) self.zoom_percent_input.setText(str(percent))
@@ -1012,7 +1018,7 @@ class MainWindow(QMainWindow):
self.zoom_slider.setFixedWidth(150) self.zoom_slider.setFixedWidth(150)
self.zoom_slider.setToolTip("缩放") self.zoom_slider.setToolTip("缩放")
self.zoom_percent_input = QLineEdit() self.zoom_percent_input = QLineEdit()
self.zoom_percent_input.setValidator(QIntValidator(10, 1000, self)) self.zoom_percent_input.setValidator(QIntValidator(20, 300, self))
self.zoom_percent_input.setFixedWidth(64) self.zoom_percent_input.setFixedWidth(64)
self.zoom_percent_input.setToolTip("缩放百分比") self.zoom_percent_input.setToolTip("缩放百分比")
self.page_number_input = QLineEdit() self.page_number_input = QLineEdit()
@@ -1388,7 +1394,7 @@ class MainWindow(QMainWindow):
zoom_label = QLabel("缩放") zoom_label = QLabel("缩放")
zoom_label.setObjectName("statusZoomLabel") zoom_label.setObjectName("statusZoomLabel")
self.zoom_slider.setObjectName("statusZoomSlider") self.zoom_slider.setObjectName("statusZoomSlider")
self.zoom_slider.setFixedWidth(170) self.zoom_slider.setFixedWidth(230)
self.zoom_percent_input.setObjectName("statusZoomPercent") self.zoom_percent_input.setObjectName("statusZoomPercent")
self.zoom_percent_input.setFixedWidth(58) self.zoom_percent_input.setFixedWidth(58)
@@ -1413,7 +1419,7 @@ class MainWindow(QMainWindow):
]: ]:
controls_layout.addWidget(widget) controls_layout.addWidget(widget)
widget.show() widget.show()
controls.setFixedWidth(760) controls.setFixedWidth(850)
status.addPermanentWidget(controls, 0) status.addPermanentWidget(controls, 0)
def _connect_signals(self) -> None: def _connect_signals(self) -> None:
+3 -3
View File
@@ -222,13 +222,13 @@ class PdfViewer(QScrollArea):
self.page_changed.emit(self.page_index) self.page_changed.emit(self.page_index)
def zoom_in(self) -> None: def zoom_in(self) -> None:
self.set_zoom(min(10.0, self.zoom + 0.15)) self.set_zoom(min(3.0, self.zoom + 0.15))
def zoom_out(self) -> None: def zoom_out(self) -> None:
self.set_zoom(max(0.1, self.zoom - 0.15)) self.set_zoom(max(0.2, self.zoom - 0.15))
def set_zoom(self, zoom: float) -> None: def set_zoom(self, zoom: float) -> None:
self.zoom = max(0.1, min(10.0, zoom)) self.zoom = max(0.2, min(3.0, zoom))
self.render() self.render()
def wheelEvent(self, event: QWheelEvent) -> None: def wheelEvent(self, event: QWheelEvent) -> None: