feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Editor: avoid accessing the widget from the FontSettingsPage

Browse Source 
Change-Id: I51dbf4d1c7384f460b84da9602c10667addabebb
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
David Schulz
2023-07-06 12:54:28 +02:00
committed by hjk
parent 596a687b41
commit c58bf7f5b8
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/texteditor/fontsettingspage.cpp
View File

@@ -202,6 +202,8 @@ public:
this, &FontSettingsPageWidget::importScheme); this, &FontSettingsPageWidget::importScheme);
connect(exportButton, &QPushButton::clicked, connect(exportButton, &QPushButton::clicked,
this, &FontSettingsPageWidget::exportScheme); this, &FontSettingsPageWidget::exportScheme);
connect(TextEditorSettings::instance(), &TextEditorSettings::fontSettingsChanged,
this, &FontSettingsPageWidget::updateFontZoom);
updatePointSizes(); updatePointSizes();
refreshColorSchemeList(); refreshColorSchemeList();
@@ -226,6 +228,7 @@ public:
void maybeSaveColorScheme(); void maybeSaveColorScheme();
void updatePointSizes(); void updatePointSizes();
void updateFontZoom(const FontSettings &fontSettings);
QList<int> pointSizesForSelectedFont() const; QList<int> pointSizesForSelectedFont() const;
void refreshColorSchemeList(); void refreshColorSchemeList();
@@ -449,6 +452,11 @@ void FontSettingsPageWidget::updatePointSizes()
m_sizeComboBox->setCurrentIndex(idx); m_sizeComboBox->setCurrentIndex(idx);
} }
void FontSettingsPageWidget::updateFontZoom(const FontSettings &fontSettings)
{
m_zoomSpinBox->setValue(fontSettings.fontZoom());
}
QList<int> FontSettingsPageWidget::pointSizesForSelectedFont() const QList<int> FontSettingsPageWidget::pointSizesForSelectedFont() const
{ {
QFontDatabase db; QFontDatabase db;
@@ -774,10 +782,4 @@ FontSettingsPage::FontSettingsPage(FontSettings *fontSettings, const FormatDescr
setWidgetCreator([this, fontSettings, fd] { return new FontSettingsPageWidget(this, fd, fontSettings); }); setWidgetCreator([this, fontSettings, fd] { return new FontSettingsPageWidget(this, fd, fontSettings); });
} }
void FontSettingsPage::setFontZoom(int zoom)
{
if (m_widget)
static_cast<FontSettingsPageWidget *>(m_widget.data())->m_zoomSpinBox->setValue(zoom);
}
} // TextEditor } // TextEditor

1
src/plugins/texteditor/texteditorsettings.cpp
View File

@@ -583,7 +583,6 @@ Utils::Id TextEditorSettings::languageId(const QString &mimeType)
static void setFontZoom(int zoom) static void setFontZoom(int zoom)
{ {
d->m_fontSettingsPage.setFontZoom(zoom);
d->m_fontSettings.setFontZoom(zoom); d->m_fontSettings.setFontZoom(zoom);
d->m_fontSettings.toSettings(Core::ICore::settings()); d->m_fontSettings.toSettings(Core::ICore::settings());
emit m_instance->fontSettingsChanged(d->m_fontSettings); emit m_instance->fontSettingsChanged(d->m_fontSettings);