diff --git a/src/plugins/texteditor/texteditor.cpp b/src/plugins/texteditor/texteditor.cpp index 5569d514d02..f7f6db73ac2 100644 --- a/src/plugins/texteditor/texteditor.cpp +++ b/src/plugins/texteditor/texteditor.cpp @@ -81,6 +81,7 @@ #include #include #include +#include #include #include #include @@ -3022,11 +3023,6 @@ void TextEditorWidgetPrivate::setupDocumentSignals() connect(settings, &TextEditorSettings::extraEncodingSettingsChanged, q, &TextEditorWidget::setExtraEncodingSettings); - connect(q, &TextEditorWidget::requestFontZoom, - settings, &TextEditorSettings::fontZoomRequested); - connect(q, &TextEditorWidget::requestZoomReset, - settings, &TextEditorSettings::zoomResetRequested); - // Apply current settings m_document->setFontSettings(settings->fontSettings()); m_document->setTabSettings(settings->codeStyle()->tabSettings()); // also set through code style ??? @@ -5494,12 +5490,15 @@ void TextEditorWidget::zoomF(float delta) else if (step < 0 && step > -1) step = -1; - emit requestFontZoom(step); + const int newZoom = TextEditorSettings::instance()->increaseFontZoom(int(step)); + Utils::FadingIndicator::showText(this, + tr("Zoom: %1%").arg(newZoom), + Utils::FadingIndicator::SmallText); } void TextEditorWidget::zoomReset() { - emit requestZoomReset(); + TextEditorSettings::instance()->resetFontZoom(); } TextEditorWidget::Link TextEditorWidget::findLinkAt(const QTextCursor &, bool, bool) diff --git a/src/plugins/texteditor/texteditor.h b/src/plugins/texteditor/texteditor.h index 001d1aa07e8..c4ab6864a20 100644 --- a/src/plugins/texteditor/texteditor.h +++ b/src/plugins/texteditor/texteditor.h @@ -479,8 +479,6 @@ signals: void assistFinished(); // Used in tests. void readOnlyChanged(); - void requestFontZoom(int zoom); - void requestZoomReset(); void requestBlockUpdate(const QTextBlock &); protected: diff --git a/src/plugins/texteditor/texteditorsettings.cpp b/src/plugins/texteditor/texteditorsettings.cpp index ccbcf774046..02e821d7533 100644 --- a/src/plugins/texteditor/texteditorsettings.cpp +++ b/src/plugins/texteditor/texteditorsettings.cpp @@ -50,7 +50,6 @@ #include #include -#include #include #include @@ -509,23 +508,19 @@ Core::Id TextEditorSettings::languageId(const QString &mimeType) return d->m_mimeTypeToLanguage.value(mimeType); } -void TextEditorSettings::fontZoomRequested(int zoom) +int TextEditorSettings::increaseFontZoom(int step) { FontSettings &fs = const_cast(d->m_fontSettingsPage->fontSettings()); const int previousZoom = fs.fontZoom(); - const int newZoom = qMax(10, previousZoom + zoom); - if (newZoom == previousZoom) - return; - fs.setFontZoom(newZoom); - if (QWidget *editor = qobject_cast(sender())) { - Utils::FadingIndicator::showText(editor, - tr("Zoom: %1%").arg(newZoom), - Utils::FadingIndicator::SmallText); + const int newZoom = qMax(10, previousZoom + step); + if (newZoom != previousZoom) { + fs.setFontZoom(newZoom); + d->m_fontSettingsPage->saveSettings(); } - d->m_fontSettingsPage->saveSettings(); + return newZoom; } -void TextEditorSettings::zoomResetRequested() +void TextEditorSettings::resetFontZoom() { FontSettings &fs = const_cast(d->m_fontSettingsPage->fontSettings()); fs.setFontZoom(100); diff --git a/src/plugins/texteditor/texteditorsettings.h b/src/plugins/texteditor/texteditorsettings.h index 8607675f5e5..eb06ebb2658 100644 --- a/src/plugins/texteditor/texteditorsettings.h +++ b/src/plugins/texteditor/texteditorsettings.h @@ -103,8 +103,8 @@ public: static void registerMimeTypeForLanguageId(const char *mimeType, Core::Id languageId); static Core::Id languageId(const QString &mimeType); - void fontZoomRequested(int zoom); - void zoomResetRequested(); + static int increaseFontZoom(int step); + static void resetFontZoom(); signals: void fontSettingsChanged(const TextEditor::FontSettings &);