Emit signal isntead of passing parameter '-1'

src/annotations/core/AbstractSettingsProvider.cpp

@@ -79,4 +79,9 @@ void AbstractSettingsProvider::zoomValueChanged(double value)
 	}
 }
 
+void AbstractSettingsProvider::fitImageToView()
+{
+	mZoomValueProvider->fitImageToView();
+}
+
 } // namespace kImageAnnotator

src/annotations/core/AbstractSettingsProvider.h

@@ -58,6 +58,7 @@ class AbstractSettingsProvider
 	virtual void itemSettingChanged();
 	virtual void effectChanged(ImageEffects effect);
 	virtual void zoomValueChanged(double value);
+	virtual void fitImageToView();
 
 private:
 	ISettingsListener *mSettingsListener;

src/annotations/core/ZoomValueProvider.h

@@ -32,6 +32,7 @@ class ZoomValueProvider : public QObject
 	~ZoomValueProvider() override = default;
 	virtual double zoomValue() const = 0;
 	virtual void setZoomValue(double zoomValue) = 0;
+	virtual void fitImageToView() = 0;
 
 signals:
 	void zoomValueChanged(double value);

src/gui/annotator/settings/AnnotationGeneralSettings.cpp

@@ -45,6 +45,7 @@ void AnnotationGeneralSettings::initGui()
 	setFocusPolicy(Qt::ClickFocus);
 
 	connect(mZoomPicker, &ZoomPicker::zoomValueChanged, this, &AnnotationGeneralSettings::zoomValueChanged);
+	connect(mZoomPicker, &ZoomPicker::fitImageToView, this, &AnnotationGeneralSettings::fitImageToCurrentView);
 }
 
 void AnnotationGeneralSettings::updateZoomLevel(double value)

src/gui/annotator/settings/AnnotationGeneralSettings.h

@@ -36,6 +36,7 @@ Q_OBJECT
 
 signals:
 	void zoomValueChanged(double value);
+	void fitImageToCurrentView();
 
 private:
 	QBoxLayout *mMainLayout;

src/gui/annotator/settings/AnnotationSettingsAdapter.cpp

@@ -40,6 +40,7 @@ AnnotationSettingsAdapter::AnnotationSettingsAdapter(
 	connect(mImageSettings, &AnnotationImageSettings::effectChanged, this, &AnnotationSettingsAdapter::effectChanged);
 
 	connect(mGeneralSettings, &AnnotationGeneralSettings::zoomValueChanged, this, &AnnotationSettingsAdapter::zoomValueChanged);
+	connect(mGeneralSettings, &AnnotationGeneralSettings::fitImageToCurrentView, this, &AnnotationSettingsAdapter::fitImageToCurrentView);
 
 	connect(mItemSettings, &AnnotationItemSettings::toolColorChanged, this, &AnnotationSettingsAdapter::toolColorChanged);
 	connect(mItemSettings, &AnnotationItemSettings::toolWidthChanged, this, &AnnotationSettingsAdapter::toolWidthChanged);
@@ -144,6 +145,11 @@ void AnnotationSettingsAdapter::zoomValueChanged(double value)
 	AbstractSettingsProvider::zoomValueChanged(value);
 }
 
+void AnnotationSettingsAdapter::fitImageToCurrentView()
+{
+	AbstractSettingsProvider::fitImageToView();
+}
+
 void AnnotationSettingsAdapter::loadFromConfig(Tools tool)
 {
 	mItemSettings->setUpForTool(tool);

src/gui/annotator/settings/AnnotationSettingsAdapter.h

@@ -84,6 +84,7 @@ private slots:
 	void stickerChanged(const QString &sticker);
 	void shadowEnabledChanged(bool enabled);
 	void fontChanged(const QFont &font);
+	void fitImageToCurrentView();
 };
 
 } // namespace kImageAnnotator

src/gui/scrollAndZoomView/ViewZoomer.cpp

@@ -65,19 +65,14 @@ void ViewZoomer::wheelZoom(QWheelEvent *event)
 	event->accept(); // supress scrolling
 }
 
-void ViewZoomer::fitImage()
+void ViewZoomer::fitImageToView()
 {
 	mView->fitInView(mView->sceneRect(), Qt::KeepAspectRatio);
+	emit zoomValueChanged(zoomValue());
 }
 
 void ViewZoomer::setZoomValue(double value)
 {
-	// ZoomPicker's mFitImageButton() sets value to -1
-	if (value < 0) {
-		fitImage();
-		emit zoomValueChanged(zoomValue());
-		return;
-	}
 	zoom(value - zoomValue());
 }
 

src/gui/scrollAndZoomView/ViewZoomer.h

@@ -42,7 +42,7 @@ class ViewZoomer : public ZoomValueProvider
 	void zoom(double factor);
 	void zoomToPoint(double factor, const QPoint &viewPoint);
 	void wheelZoom(QWheelEvent *event);
-	void fitImage();
+	void fitImageToView() override;
 
 private:
 	QGraphicsView *mView;

src/widgets/settingsPicker/ZoomPicker.cpp

@@ -113,9 +113,9 @@ void ZoomPicker::setZoomValue(double value)
 	mSpinBox->setValueSilent(zoomValue);
 }
 
-void ZoomPicker::fitImageToView()
+void ZoomPicker::fitImageToCurrentView()
 {
-	emit zoomValueChanged(-1);
+	emit fitImageToView();
 }
 
 void ZoomPicker::notifyZoomValueChanged(double value)

src/widgets/settingsPicker/ZoomPicker.h

@@ -44,10 +44,11 @@ Q_OBJECT
 
 public slots:
 	void setZoomValue(double value);
-	void fitImageToView();
+	void fitImageToCurrentView();
 
 signals:
 	void zoomValueChanged(double zoomLevel);
+	void fitImageToView();
 
 protected:
 	QWidget* expandingWidget() override;