[LyX/master] Properly set initial zoom value
Juergen Spitzmueller
spitz at lyx.org
Sun Mar 7 16:16:58 UTC 2021
commit bc300585f7e5aaf412a843638b90b8c311b99e5a
Author: Juergen Spitzmueller <spitz at lyx.org>
Date: Sun Mar 7 17:09:03 2021 +0100
Properly set initial zoom value
This depends on settings
---
src/frontends/qt/GuiView.cpp | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/frontends/qt/GuiView.cpp b/src/frontends/qt/GuiView.cpp
index 5e68603..e542dc9 100644
--- a/src/frontends/qt/GuiView.cpp
+++ b/src/frontends/qt/GuiView.cpp
@@ -637,7 +637,14 @@ GuiView::GuiView(int id)
#endif
// Make the defaultZoom center
zoomslider->setRange(10, (lyxrc.defaultZoom * 2) - 10);
- zoomslider->setValue(lyxrc.currentZoom);
+ // Initialize proper zoom value
+ QSettings settings;
+ zoom_ratio_ = settings.value("zoom_ratio", 1.0).toDouble();
+ // Actual zoom value: default zoom + fractional offset
+ int zoom = (int)(lyxrc.defaultZoom * zoom_ratio_);
+ if (zoom < static_cast<int>(zoom_min_))
+ zoom = zoom_min_;
+ zoomslider->setValue(zoom);
zoomslider->setToolTip(qt_("Workarea zoom level. Drag, use Ctrl-+/- or Shift-Mousewheel to adjust."));
zoomslider->setTickPosition(QSlider::TicksBelow);
zoomslider->setTickInterval(lyxrc.defaultZoom - 10);
@@ -713,7 +720,6 @@ GuiView::GuiView(int id)
initToolbars();
// clear session data if any.
- QSettings settings;
settings.remove("views");
}
More information about the lyx-cvs
mailing list