From 13275933c8cccbae08f2e580cbbccb8771b300fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20=C3=81ngel=20San=20Mart=C3=ADn?= Date: Wed, 9 Dec 2015 22:47:24 +0100 Subject: [PATCH] fixed wrong setting being used as reading zoom, ZOOM_LEVEL has to be renamed to FLOW_ZOOM_LEVEL --- YACReader/configuration.h | 4 ++-- YACReader/width_slider.cpp | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/YACReader/configuration.h b/YACReader/configuration.h index 1857255c..384595dd 100644 --- a/YACReader/configuration.h +++ b/YACReader/configuration.h @@ -58,8 +58,8 @@ using namespace YACReader; void setMagnifyingGlassSize(const QSize & mgs) { settings->setValue(MAG_GLASS_SIZE,mgs);} QSize getGotoSlideSize() { return settings->value(GO_TO_FLOW_SIZE).toSize();} void setGotoSlideSize(const QSize & gss) { settings->setValue(GO_TO_FLOW_SIZE,gss);} - float getZoomLevel() { return settings->value(ZOOM_LEVEL).toInt();} - void setZoomLevel(int zl) { settings->setValue(ZOOM_LEVEL,zl);} + float getZoomLevel() { return settings->value(ZOOM_LEVEL).toFloat();} + void setZoomLevel(float zl) { settings->setValue(ZOOM_LEVEL,zl);} //Unified enum based fitmode YACReader::FitMode getFitMode() { return static_cast(settings->value(FITMODE, YACReader::FitMode::FullPage).toInt()); } diff --git a/YACReader/width_slider.cpp b/YACReader/width_slider.cpp index b500d7a2..fd058f98 100644 --- a/YACReader/width_slider.cpp +++ b/YACReader/width_slider.cpp @@ -75,9 +75,8 @@ YACReaderSlider::YACReaderSlider(QWidget *parent) slider->setFocusPolicy(Qt::NoFocus); - int value = Configuration::getConfiguration().getZoomLevel()*100; - slider->setValue(value); - percentageLabel->setText(QString("%1 %").arg(value)); + slider->setValue(100); + percentageLabel->setText(QString("%1 %").arg(100)); connect(slider,SIGNAL(valueChanged(int)),this,SLOT(updateText(int))); } @@ -96,7 +95,6 @@ void YACReaderSlider::focusOutEvent(QFocusEvent * event) void YACReaderSlider::updateText(int value) { percentageLabel->setText(QString("%1 %").arg(value)); - Configuration::getConfiguration().setZoomLevel(value); emit zoomRatioChanged(value); }