Adjust zoom status range and spacing
This commit is contained in:
@@ -291,11 +291,17 @@ class MainWindow(QMainWindow):
|
||||
self.viewer.set_zoom(self._zoom_from_slider_value(value))
|
||||
|
||||
def _slider_value_from_zoom(self, zoom: float) -> int:
|
||||
clamped_zoom = max(0.1, min(10.0, zoom))
|
||||
return round((math.log10(clamped_zoom) + 1.0) * 1000)
|
||||
min_zoom = 0.2
|
||||
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:
|
||||
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
|
||||
|
||||
def apply_zoom_percent_input(self) -> None:
|
||||
@@ -308,7 +314,7 @@ class MainWindow(QMainWindow):
|
||||
except ValueError:
|
||||
self._sync_zoom_controls(self.viewer.zoom)
|
||||
return
|
||||
if 10 <= percent <= 1000:
|
||||
if 20 <= percent <= 300:
|
||||
self.viewer.set_zoom(percent / 100)
|
||||
self._sync_zoom_controls(self.viewer.zoom)
|
||||
|
||||
@@ -321,7 +327,7 @@ class MainWindow(QMainWindow):
|
||||
return
|
||||
if watched is not None and watched is not self._current_session():
|
||||
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):
|
||||
self.zoom_slider.setValue(self._slider_value_from_zoom(zoom))
|
||||
self.zoom_percent_input.setText(str(percent))
|
||||
@@ -1012,7 +1018,7 @@ class MainWindow(QMainWindow):
|
||||
self.zoom_slider.setFixedWidth(150)
|
||||
self.zoom_slider.setToolTip("缩放")
|
||||
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.setToolTip("缩放百分比")
|
||||
self.page_number_input = QLineEdit()
|
||||
@@ -1388,7 +1394,7 @@ class MainWindow(QMainWindow):
|
||||
zoom_label = QLabel("缩放")
|
||||
zoom_label.setObjectName("statusZoomLabel")
|
||||
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.setFixedWidth(58)
|
||||
|
||||
@@ -1413,7 +1419,7 @@ class MainWindow(QMainWindow):
|
||||
]:
|
||||
controls_layout.addWidget(widget)
|
||||
widget.show()
|
||||
controls.setFixedWidth(760)
|
||||
controls.setFixedWidth(850)
|
||||
status.addPermanentWidget(controls, 0)
|
||||
|
||||
def _connect_signals(self) -> None:
|
||||
|
||||
Reference in New Issue
Block a user