drifty/emulator
1
0
Fork 0
mirror of https://git.citron-emu.org/citron/emulator synced 2025-12-19 10:43:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix/themes

Browse Source 
Signed-off-by: Collecting <collecting@noreply.localhost>
This commit is contained in:
Collecting
2025-11-02 04:39:05 +00:00
parent 3413912a94
commit 1a07eb4ad1
1 changed files with 44 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
src/citron/uisettings.cpp
View File

@@ -2,6 +2,8 @@
// SPDX-FileCopyrightText: 2025 citron Emulator Project // SPDX-FileCopyrightText: 2025 citron Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later // SPDX-License-Identifier: GPL-2.0-or-later
#include <QApplication>
#include <QPalette>
#include <QSettings> #include <QSettings>
#include "common/fs/fs.h" #include "common/fs/fs.h"
#include "common/fs/path_util.h" #include "common/fs/path_util.h"
@@ -33,34 +35,50 @@ namespace UISettings {
}}; }};
bool IsDarkTheme() { bool IsDarkTheme() {
const auto& theme = UISettings::values.theme; const auto& theme_name = UISettings::values.theme;
return theme == std::string("qdarkstyle") || theme == std::string("qdarkstyle_midnight_blue") ||
theme == std::string("colorful_dark") || theme == std::string("colorful_midnight_blue"); // Priority 1: Check for explicitly chosen dark themes.
if (theme_name == "qdarkstyle" || theme_name == "colorful_dark" ||
theme_name == "qdarkstyle_midnight_blue" || theme_name == "colorful_midnight_blue") {
return true;
}
// Priority 2: Check for adaptive themes ("default" and "colorful").
if (theme_name == "default" || theme_name == "colorful") {
const QPalette palette = qApp->palette();
const QColor text_color = palette.color(QPalette::WindowText);
const QColor base_color = palette.color(QPalette::Window);
return text_color.value() > base_color.value();
}
// Fallback for any other unknown themes is to assume they are light.
return false;
} }
Values values = {}; Values values = {};
// definition for the function.
u32 CalculateWidth(u32 height, Settings::AspectRatio ratio) { u32 CalculateWidth(u32 height, Settings::AspectRatio ratio) {
switch (ratio) { switch (ratio) {
case Settings::AspectRatio::R4_3: case Settings::AspectRatio::R4_3:
return height * 4 / 3; return height * 4 / 3;
case Settings::AspectRatio::R21_9: case Settings::AspectRatio::R21_9:
return height * 21 / 9; return height * 21 / 9;
case Settings::AspectRatio::R16_10: case Settings::AspectRatio::R16_10:
return height * 16 / 10; return height * 16 / 10;
case Settings::AspectRatio::R32_9: case Settings::AspectRatio::R32_9:
return height * 32 / 9; return height * 32 / 9;
case Settings::AspectRatio::R16_9: case Settings::AspectRatio::R16_9:
case Settings::AspectRatio::Stretch: case Settings::AspectRatio::Stretch:
// TODO: Move this function wherever appropriate to implement Stretched aspect // TODO: Move this function wherever appropriate to implement Stretched aspect
break; break;
} }
return height * 16 / 9; return height * 16 / 9;
} }
void SaveWindowState() { void SaveWindowState() {
const auto window_state_config_loc = const auto window_state_config_loc =
FS::PathToUTF8String(FS::GetCitronPath(FS::CitronPath::ConfigDir) / "window_state.ini"); FS::PathToUTF8String(FS::GetCitronPath(FS::CitronPath::ConfigDir) / "window_state.ini");
void(FS::CreateParentDir(window_state_config_loc)); void(FS::CreateParentDir(window_state_config_loc));
QSettings config(QString::fromStdString(window_state_config_loc), QSettings::IniFormat); QSettings config(QString::fromStdString(window_state_config_loc), QSettings::IniFormat);
@@ -78,12 +96,12 @@ namespace UISettings {
void RestoreWindowState(std::unique_ptr<QtConfig>& qtConfig) { void RestoreWindowState(std::unique_ptr<QtConfig>& qtConfig) {
const auto window_state_config_loc = const auto window_state_config_loc =
FS::PathToUTF8String(FS::GetCitronPath(FS::CitronPath::ConfigDir) / "window_state.ini"); FS::PathToUTF8String(FS::GetCitronPath(FS::CitronPath::ConfigDir) / "window_state.ini");
// Migrate window state from old location // Migrate window state from old location
if (!FS::Exists(window_state_config_loc) && qtConfig->Exists("UI", "UILayout\\geometry")) { if (!FS::Exists(window_state_config_loc) && qtConfig->Exists("UI", "UILayout\\geometry")) {
const auto config_loc = const auto config_loc =
FS::PathToUTF8String(FS::GetCitronPath(FS::CitronPath::ConfigDir) / "qt-config.ini"); FS::PathToUTF8String(FS::GetCitronPath(FS::CitronPath::ConfigDir) / "qt-config.ini");
QSettings config(QString::fromStdString(config_loc), QSettings::IniFormat); QSettings config(QString::fromStdString(config_loc), QSettings::IniFormat);
config.beginGroup(QStringLiteral("UI")); config.beginGroup(QStringLiteral("UI"));
@@ -91,11 +109,11 @@ namespace UISettings {
values.geometry = config.value(QStringLiteral("geometry")).toByteArray(); values.geometry = config.value(QStringLiteral("geometry")).toByteArray();
values.state = config.value(QStringLiteral("state")).toByteArray(); values.state = config.value(QStringLiteral("state")).toByteArray();
values.renderwindow_geometry = values.renderwindow_geometry =
config.value(QStringLiteral("geometryRenderWindow")).toByteArray(); config.value(QStringLiteral("geometryRenderWindow")).toByteArray();
values.gamelist_header_state = values.gamelist_header_state =
config.value(QStringLiteral("gameListHeaderState")).toByteArray(); config.value(QStringLiteral("gameListHeaderState")).toByteArray();
values.microprofile_geometry = values.microprofile_geometry =
config.value(QStringLiteral("microProfileDialogGeometry")).toByteArray(); config.value(QStringLiteral("microProfileDialogGeometry")).toByteArray();
config.endGroup(); config.endGroup();
config.endGroup(); config.endGroup();
return; return;
@@ -107,15 +125,15 @@ namespace UISettings {
values.geometry = config.value(QStringLiteral("geometry")).toByteArray(); values.geometry = config.value(QStringLiteral("geometry")).toByteArray();
values.state = config.value(QStringLiteral("state")).toByteArray(); values.state = config.value(QStringLiteral("state")).toByteArray();
values.renderwindow_geometry = values.renderwindow_geometry =
config.value(QStringLiteral("geometryRenderWindow")).toByteArray(); config.value(QStringLiteral("geometryRenderWindow")).toByteArray();
values.configure_dialog_geometry = values.configure_dialog_geometry =
config.value(QStringLiteral("configureDialogGeometry")).toByteArray(); config.value(QStringLiteral("configureDialogGeometry")).toByteArray();
values.per_game_configure_geometry = values.per_game_configure_geometry =
config.value(QStringLiteral("perGameConfigureGeometry")).toByteArray(); config.value(QStringLiteral("perGameConfigureGeometry")).toByteArray();
values.gamelist_header_state = values.gamelist_header_state =
config.value(QStringLiteral("gameListHeaderState")).toByteArray(); config.value(QStringLiteral("gameListHeaderState")).toByteArray();
values.microprofile_geometry = values.microprofile_geometry =
config.value(QStringLiteral("microProfileDialogGeometry")).toByteArray(); config.value(QStringLiteral("microProfileDialogGeometry")).toByteArray();
} }
} // namespace UISettings } // namespace UISettings