chatterino2
Code Issues

Add simple fontChanged signal

Browse Source 
Delete copy/move constructor of FontManager :kkona:
Fix places that were using the copy constructor of the FontManager
This commit is contained in:
Rasmus Karlsson
2017-10-27 21:02:58 +02:00
parent 37571ae613
commit c08059c6a8
3 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/widgets/settingsdialog.cpp
+5 -4
View File
@@ -158,7 +158,7 @@ QVBoxLayout *SettingsDialog::createAccountsTab()
QVBoxLayout *SettingsDialog::createAppearanceTab()
{
SettingsManager &settings = SettingsManager::getInstance();
auto &settings = SettingsManager::getInstance();
auto layout = this->createTabLayout();
{
@@ -176,8 +176,9 @@ QVBoxLayout *SettingsDialog::createAppearanceTab()
fontLayout->addWidget(fontFamilyLabel);
fontLayout->addWidget(fontSizeLabel);
{
auto fontManager = FontManager::getInstance();
auto &fontManager = FontManager::getInstance();
fontManager.currentFontFamily.getValueChangedSignal().connect(
[fontFamilyLabel](const std::string &newValue) {
@@ -191,11 +192,11 @@ QVBoxLayout *SettingsDialog::createAppearanceTab()
}
fontButton->connect(fontButton, &QPushButton::clicked, []() {
auto fontManager = FontManager::getInstance();
auto &fontManager = FontManager::getInstance();
QFontDialog dialog(fontManager.getFont(FontManager::Medium));
dialog.connect(&dialog, &QFontDialog::fontSelected, [](const QFont &font) {
auto fontManager = FontManager::getInstance();
auto &fontManager = FontManager::getInstance();
fontManager.currentFontFamily = font.family().toStdString();
fontManager.currentFontSize = font.pointSize();
});