Merge branch 'master' into apa-notification-on-live

This commit is contained in:
pajlada
2018-09-16 17:43:53 +02:00
committed by GitHub
53 changed files with 628 additions and 227 deletions
+2 -1
View File
@@ -35,6 +35,7 @@ SettingsDialog::SettingsDialog()
this->scaleChangedEvent(this->getScale());
this->overrideBackgroundColor_ = QColor("#282828");
this->themeChangedEvent();
}
void SettingsDialog::initUi()
@@ -187,7 +188,7 @@ void SettingsDialog::themeChangedEvent()
BaseWindow::themeChangedEvent();
QPalette palette;
palette.setColor(QPalette::Background, QColor("#444"));
palette.setColor(QPalette::Background, QColor("#222"));
this->setPalette(palette);
}