diff options
| author | Chrono <me@disilla.org> | 2022-10-31 20:06:59 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-31 20:06:59 -0400 |
| commit | ce1a4857ccf2d2ac043a3d26cca455f2b03f24c4 (patch) | |
| tree | 35d02a383e3332ade87a7995fb669278f1632429 /launcher/Application.cpp | |
| parent | dfdf739282792ca646bb284b3d83b2d2265a9d55 (diff) | |
| parent | 7086b1e65ceab38c823542af2c652726d2ad1e09 (diff) | |
| download | PrismLauncher-ce1a4857ccf2d2ac043a3d26cca455f2b03f24c4.tar.gz PrismLauncher-ce1a4857ccf2d2ac043a3d26cca455f2b03f24c4.tar.bz2 PrismLauncher-ce1a4857ccf2d2ac043a3d26cca455f2b03f24c4.zip | |
Merge branch 'PrismLauncher:develop' into develop
Diffstat (limited to 'launcher/Application.cpp')
| -rw-r--r-- | launcher/Application.cpp | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/launcher/Application.cpp b/launcher/Application.cpp index c6814abf..2da8ac56 100644 --- a/launcher/Application.cpp +++ b/launcher/Application.cpp @@ -62,6 +62,7 @@ #ifdef Q_OS_WIN #include "ui/WinDarkmode.h" +#include <versionhelpers.h> #endif #include "ui/setupwizard/SetupWizard.h" @@ -1136,15 +1137,6 @@ std::vector<ITheme *> Application::getValidApplicationThemes() return ret; } -bool Application::isFlatpak() -{ - #ifdef Q_OS_LINUX - return QFile::exists("/.flatpak-info"); - #else - return false; - #endif -} - void Application::setApplicationTheme(const QString& name, bool initial) { auto systemPalette = qApp->palette(); @@ -1154,7 +1146,7 @@ void Application::setApplicationTheme(const QString& name, bool initial) auto & theme = (*themeIter).second; theme->apply(initial); #ifdef Q_OS_WIN - if (m_mainWindow) { + if (m_mainWindow && IsWindows10OrGreater()) { if (QString::compare(theme->id(), "dark") == 0) { WinDarkmode::setDarkWinTitlebar(m_mainWindow->winId(), true); } else { @@ -1395,10 +1387,13 @@ MainWindow* Application::showMainWindow(bool minimized) m_mainWindow->restoreState(QByteArray::fromBase64(APPLICATION->settings()->get("MainWindowState").toByteArray())); m_mainWindow->restoreGeometry(QByteArray::fromBase64(APPLICATION->settings()->get("MainWindowGeometry").toByteArray())); #ifdef Q_OS_WIN - if (QString::compare(settings()->get("ApplicationTheme").toString(), "dark") == 0) { - WinDarkmode::setDarkWinTitlebar(m_mainWindow->winId(), true); - } else { - WinDarkmode::setDarkWinTitlebar(m_mainWindow->winId(), false); + if (IsWindows10OrGreater()) + { + if (QString::compare(settings()->get("ApplicationTheme").toString(), "dark") == 0) { + WinDarkmode::setDarkWinTitlebar(m_mainWindow->winId(), true); + } else { + WinDarkmode::setDarkWinTitlebar(m_mainWindow->winId(), false); + } } #endif if(minimized) |