diff options
author | Kyle Kienapfel <Docteh@users.noreply.github.com> | 2022-08-12 15:10:18 +0200 |
---|---|---|
committer | Kyle Kienapfel <Docteh@users.noreply.github.com> | 2022-08-12 15:13:12 +0200 |
commit | d4b1095173cf32dbd9a890b066d991ca795abd80 (patch) | |
tree | 06b005be2ddeabe853ec098dabcd188b16eb78ed | |
parent | assign colors to default_dark theme (diff) | |
download | yuzu-d4b1095173cf32dbd9a890b066d991ca795abd80.tar yuzu-d4b1095173cf32dbd9a890b066d991ca795abd80.tar.gz yuzu-d4b1095173cf32dbd9a890b066d991ca795abd80.tar.bz2 yuzu-d4b1095173cf32dbd9a890b066d991ca795abd80.tar.lz yuzu-d4b1095173cf32dbd9a890b066d991ca795abd80.tar.xz yuzu-d4b1095173cf32dbd9a890b066d991ca795abd80.tar.zst yuzu-d4b1095173cf32dbd9a890b066d991ca795abd80.zip |
-rw-r--r-- | src/yuzu/main.cpp | 6 | ||||
-rw-r--r-- | src/yuzu/main.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index e473ac6da..5111b0eba 100644 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp @@ -257,7 +257,7 @@ static QString PrettyProductName() { return QSysInfo::prettyProductName(); } -bool GMainWindow::check_dark_mode() { +bool GMainWindow::CheckDarkMode() { #ifdef __linux__ const QPalette test_palette(qApp->palette()); const QColor text_color = test_palette.color(QPalette::Active, QPalette::Text); @@ -287,7 +287,7 @@ GMainWindow::GMainWindow(bool has_broken_vulkan) statusBar()->hide(); // Check dark mode before a theme is loaded - os_dark_mode = check_dark_mode(); + os_dark_mode = CheckDarkMode(); startup_icon_theme = QIcon::themeName(); // fallback can only be set once, colorful theme icons are okay on both light/dark QIcon::setFallbackThemeName(QStringLiteral("colorful")); @@ -3979,7 +3979,7 @@ void GMainWindow::UpdateUITheme() { QIcon::setThemeName(current_theme == QStringLiteral("colorful") ? current_theme : startup_icon_theme); QIcon::setThemeSearchPaths(theme_paths); - if (check_dark_mode()) { + if (CheckDarkMode()) { current_theme = QStringLiteral("default_dark"); } } else { diff --git a/src/yuzu/main.h b/src/yuzu/main.h index 2d1c8857b..0b25ebe6c 100644 --- a/src/yuzu/main.h +++ b/src/yuzu/main.h @@ -348,6 +348,7 @@ private: void OpenURL(const QUrl& url); void LoadTranslation(); void OpenPerGameConfiguration(u64 title_id, const std::string& file_name); + bool CheckDarkMode(); QString GetTasStateDescription() const; @@ -395,7 +396,6 @@ private: QString startup_icon_theme; bool os_dark_mode = false; - bool check_dark_mode(); // FS std::shared_ptr<FileSys::VfsFilesystem> vfs; |