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

TextEditor: Move FontSettingsPage more towards new scheme

Browse Source 
Mainly re-using the existing pimpl as new widget implementation, and
using the primary storage out of the page (into texteditorsettings).

This one is structutally bit different as there is that second path
(Ctrl+Wheel) to modify font zoom.

Change-Id: I7b85c781c7c53a733b234754beb5bb54664be3fd
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2020-01-27 13:52:32 +01:00
parent 0dadf19c91
commit f8ee2d3c40
5 changed files with 207 additions and 273 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -64,7 +64,8 @@ class TextEditorSettingsPrivate
Q_DECLARE_TR_FUNCTIONS(TextEditor::TextEditorSettings)
public:
FontSettingsPage m_fontSettingsPage{initialFormats()};
FontSettings m_fontSettings;
FontSettingsPage m_fontSettingsPage{&m_fontSettings, initialFormats()};
BehaviorSettingsPage m_behaviorSettingsPage;
DisplaySettingsPage m_displaySettingsPage;
HighlighterSettingsPage m_highlighterSettingsPage;
@@ -355,11 +356,9 @@ TextEditorSettings::TextEditorSettings()
// Note: default background colors are coming from FormatDescription::background()
auto updateGeneralMessagesFontSettings = []() {
Core::MessageManager::setFont(d->m_fontSettingsPage.fontSettings().font());
Core::MessageManager::setFont(d->m_fontSettings.font());
};
connect(&d->m_fontSettingsPage, &FontSettingsPage::changed,
this, &TextEditorSettings::fontSettingsChanged);
connect(&d->m_fontSettingsPage, &FontSettingsPage::changed,
connect(this, &TextEditorSettings::fontSettingsChanged,
this, updateGeneralMessagesFontSettings);
updateGeneralMessagesFontSettings();
connect(&d->m_behaviorSettingsPage, &BehaviorSettingsPage::typingSettingsChanged,
@@ -404,7 +403,7 @@ TextEditorSettings *TextEditorSettings::instance()
const FontSettings &TextEditorSettings::fontSettings()
{
return d->m_fontSettingsPage.fontSettings();
return d->m_fontSettings;
}
const TypingSettings &TextEditorSettings::typingSettings()
@@ -529,21 +528,19 @@ Core::Id TextEditorSettings::languageId(const QString &mimeType)
int TextEditorSettings::increaseFontZoom(int step)
{
auto &fs = const_cast<FontSettings&>(d->m_fontSettingsPage.fontSettings());
const int previousZoom = fs.fontZoom();
const int previousZoom = d->m_fontSettings.fontZoom();
const int newZoom = qMax(10, previousZoom + step);
if (newZoom != previousZoom) {
fs.setFontZoom(newZoom);
d->m_fontSettingsPage.saveSettings();
d->m_fontSettings.setFontZoom(newZoom);
d->m_fontSettingsPage.setFontZoom(newZoom);
}
return newZoom;
}
void TextEditorSettings::resetFontZoom()
{
auto &fs = const_cast<FontSettings&>(d->m_fontSettingsPage.fontSettings());
fs.setFontZoom(100);
d->m_fontSettingsPage.saveSettings();
d->m_fontSettings.setFontZoom(100);
d->m_fontSettingsPage.setFontZoom(100);
}
} // TextEditor