Xargon/Duckstation
1
0
Fork 0
mirror of https://github.com/RetroDECK/Duckstation.git synced 2024-11-23 06:15:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Qt: Save original style name for restoring after theme switch

Browse source
This commit is contained in:
Connor McLaughlin 2020-07-04 15:54:26 +10:00
parent 16411d7669
commit b3359dadc9
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/duckstation-qt/mainwindow.cpp
View file

@ -35,7 +35,8 @@ ALWAYS_INLINE static QString getWindowTitle()
return QStringLiteral("DuckStation %1 (%2)").arg(g_scm_tag_str).arg(g_scm_branch_str); return QStringLiteral("DuckStation %1 (%2)").arg(g_scm_tag_str).arg(g_scm_branch_str);
} }
MainWindow::MainWindow(QtHostInterface* host_interface) : QMainWindow(nullptr), m_host_interface(host_interface) MainWindow::MainWindow(QtHostInterface* host_interface)
: QMainWindow(nullptr), m_unthemed_style_name(QApplication::style()->objectName()), m_host_interface(host_interface)
{ {
m_host_interface->setMainWindow(this); m_host_interface->setMainWindow(this);
@ -649,6 +650,9 @@ void MainWindow::updateTheme()
QString theme = m_host_interface->getSettingValue(QStringLiteral("UI/Theme"), QStringLiteral("default")).toString(); QString theme = m_host_interface->getSettingValue(QStringLiteral("UI/Theme"), QStringLiteral("default")).toString();
if (theme == QStringLiteral("qdarkstyle")) if (theme == QStringLiteral("qdarkstyle"))
{ {
qApp->setStyle(m_unthemed_style_name);
qApp->setPalette(QApplication::style()->standardPalette());
QFile f(QStringLiteral(":qdarkstyle/style.qss")); QFile f(QStringLiteral(":qdarkstyle/style.qss"));
if (f.open(QFile::ReadOnly | QFile::Text)) if (f.open(QFile::ReadOnly | QFile::Text))
qApp->setStyleSheet(f.readAll()); qApp->setStyleSheet(f.readAll());
@ -691,12 +695,8 @@ void MainWindow::updateTheme()
else else
{ {
qApp->setPalette(QApplication::style()->standardPalette()); qApp->setPalette(QApplication::style()->standardPalette());
QStringList available_styles = QStyleFactory::keys();
if (!available_styles.empty())
qApp->setStyle(QStyleFactory::create(available_styles.first()));
qApp->setStyleSheet(QString()); qApp->setStyleSheet(QString());
qApp->setStyle(m_unthemed_style_name);
} }
for (QObject* obj : m_ui.menuSettingsTheme->children()) for (QObject* obj : m_ui.menuSettingsTheme->children())

2
src/duckstation-qt/mainwindow.h
View file

@ -80,6 +80,8 @@ private:
Ui::MainWindow m_ui; Ui::MainWindow m_ui;
QString m_unthemed_style_name;
QtHostInterface* m_host_interface = nullptr; QtHostInterface* m_host_interface = nullptr;
GameListWidget* m_game_list_widget = nullptr; GameListWidget* m_game_list_widget = nullptr;