pacnpal/citron
1
0
Fork 0
mirror of https://git.eden-emu.dev/archive/citron synced 2026-04-03 18:08:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix(gamescope): Restructure Configure Dialog UI for Gamescope

Browse Source 
Signed-off-by: Collecting <collecting@noreply.localhost>
This commit is contained in:
Collecting
2026-01-05 10:25:05 +00:00
parent 7b3ad22711
commit 85e24df186
1 changed files with 61 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

103
src/citron/configuration/configure_per_game.cpp
View File

@@ -76,14 +76,11 @@
static bool IsDarkMode() { static bool IsDarkMode() {
const std::string& theme_name = UISettings::values.theme; const std::string& theme_name = UISettings::values.theme;
// Priority 1: Check for explicitly chosen dark themes.
if (theme_name == "qdarkstyle" || theme_name == "colorful_dark" || if (theme_name == "qdarkstyle" || theme_name == "colorful_dark" ||
theme_name == "qdarkstyle_midnight_blue" || theme_name == "colorful_midnight_blue") { theme_name == "qdarkstyle_midnight_blue" || theme_name == "colorful_midnight_blue") {
return true; // These themes are always dark. return true;
} }
// Priority 2: Check for adaptive themes ("default" and "colorful").
// For these, we fall back to checking the OS palette.
if (theme_name == "default" || theme_name == "colorful") { if (theme_name == "default" || theme_name == "colorful") {
const QPalette palette = qApp->palette(); const QPalette palette = qApp->palette();
const QColor text_color = palette.color(QPalette::WindowText); const QColor text_color = palette.color(QPalette::WindowText);
@@ -91,7 +88,6 @@ static bool IsDarkMode() {
return text_color.value() > base_color.value(); return text_color.value() > base_color.value();
} }
// Fallback for any other unknown theme (assumed light).
return false; return false;
} }
@@ -112,7 +108,6 @@ ConfigurePerGame::ConfigurePerGame(QWidget* parent, u64 title_id_, const std::st
: fmt::format("{:016X}", title_id); : fmt::format("{:016X}", title_id);
game_config = std::make_unique<QtConfig>(config_file_name, Config::ConfigType::PerGameConfig); game_config = std::make_unique<QtConfig>(config_file_name, Config::ConfigType::PerGameConfig);
// Create tab instances
addons_tab = std::make_unique<ConfigurePerGameAddons>(system_, this); addons_tab = std::make_unique<ConfigurePerGameAddons>(system_, this);
cheats_tab = std::make_unique<ConfigurePerGameCheats>(system_, this); cheats_tab = std::make_unique<ConfigurePerGameCheats>(system_, this);
audio_tab = std::make_unique<ConfigureAudio>(system_, tab_group, *builder, this); audio_tab = std::make_unique<ConfigureAudio>(system_, tab_group, *builder, this);
@@ -126,8 +121,18 @@ ConfigurePerGame::ConfigurePerGame(QWidget* parent, u64 title_id_, const std::st
linux_tab = std::make_unique<ConfigureLinuxTab>(system_, tab_group, *builder, this); linux_tab = std::make_unique<ConfigureLinuxTab>(system_, tab_group, *builder, this);
system_tab = std::make_unique<ConfigureSystem>(system_, tab_group, *builder, this); system_tab = std::make_unique<ConfigureSystem>(system_, tab_group, *builder, this);
if (!UISettings::values.per_game_configure_geometry.isEmpty()) { const bool is_gamescope = UISettings::IsGamescope();
restoreGeometry(UISettings::values.per_game_configure_geometry);
if (is_gamescope) {
setWindowFlags(Qt::Window | Qt::CustomizeWindowHint | Qt::WindowTitleHint);
setWindowModality(Qt::NonModal);
resize(1100, 700);
} else {
setWindowFlags(Qt::Dialog | Qt::WindowTitleHint | Qt::WindowSystemMenuHint | Qt::WindowCloseButtonHint);
setWindowModality(Qt::WindowModal);
if (!UISettings::values.per_game_configure_geometry.isEmpty()) {
restoreGeometry(UISettings::values.per_game_configure_geometry);
}
} }
UpdateTheme(); UpdateTheme();
@@ -140,10 +145,8 @@ ConfigurePerGame::ConfigurePerGame(QWidget* parent, u64 title_id_, const std::st
const auto add_tab = [&](QWidget* widget, const QString& title, int id) { const auto add_tab = [&](QWidget* widget, const QString& title, int id) {
auto button = new QPushButton(title, this); auto button = new QPushButton(title, this);
button->setCheckable(true); button->setCheckable(true);
// This object name matches the stylesheet ID selector `QPushButton#aestheticTabButton`
button->setObjectName(QStringLiteral("aestheticTabButton")); button->setObjectName(QStringLiteral("aestheticTabButton"));
// This custom property is used by the event filter for the animated style button->setProperty("class", QStringLiteral("tabButton"));
button->setProperty("class", QStringLiteral("tabButton")); // Keep class for animation
button->installEventFilter(animation_filter); button->installEventFilter(animation_filter);
ui->tabButtonsLayout->addWidget(button); ui->tabButtonsLayout->addWidget(button);
@@ -177,7 +180,6 @@ ConfigurePerGame::ConfigurePerGame(QWidget* parent, u64 title_id_, const std::st
ui->stackedWidget->setCurrentIndex(0); ui->stackedWidget->setCurrentIndex(0);
} }
setFocusPolicy(Qt::ClickFocus); setFocusPolicy(Qt::ClickFocus);
setWindowTitle(tr("Properties")); setWindowTitle(tr("Properties"));
addons_tab->SetTitleId(title_id); addons_tab->SetTitleId(title_id);
@@ -322,26 +324,25 @@ void ConfigurePerGame::UpdateTheme() {
if (ui->tabButtonsScrollArea) { if (ui->tabButtonsScrollArea) {
ui->tabButtonsScrollArea->setStyleSheet(QStringLiteral( ui->tabButtonsScrollArea->setStyleSheet(QStringLiteral(
"QScrollBar:horizontal { height: 14px; background: transparent; border-radius: 7px; }" "QScrollBar:horizontal { height: 14px; background: transparent; border-radius: 7px; }"
"QScrollBar::handle:horizontal { background-color: %1; border-radius: 6px; min-width: 30px; margin: 1px; }" "QScrollBar::handle:horizontal { background-color: %1; border-radius: 64px; min-width: 30px; margin: 1px; }"
"QScrollBar::add-line, QScrollBar::sub-line { background: none; width: 0px; }" "QScrollBar::add-line, QScrollBar::sub-line { background: none; width: 0px; }"
).arg(hue_hex)); ).arg(hue_hex));
} }
// 3. Action Buttons (OK/Cancel) and Trim button // 3. Action Buttons
if (ui->buttonBox && !ui->buttonBox->underMouse()) { const QString button_css = QStringLiteral(
ui->buttonBox->setStyleSheet(QStringLiteral( "QPushButton { background-color: %1; color: #ffffff; border-radius: 4px; font-weight: bold; padding: 5px 15px; }"
"QPushButton { background-color: %1; color: #ffffff; border-radius: 4px; font-weight: bold; padding: 5px 15px; }" "QPushButton:hover { background-color: %2; }"
"QPushButton:hover { background-color: %2; }" "QPushButton:pressed { background-color: %3; }"
"QPushButton:pressed { background-color: %3; }" ).arg(hue_hex).arg(hue_light).arg(hue_dark);
).arg(hue_hex).arg(hue_light).arg(hue_dark));
}
if (ui->trim_xci_button && !ui->trim_xci_button->underMouse()) { if (ui->buttonBox) {
ui->trim_xci_button->setStyleSheet(QStringLiteral( for (auto* button : ui->buttonBox->findChildren<QPushButton*>()) {
"QPushButton { background-color: %1; color: #ffffff; border: none; border-radius: 4px; padding: 10px; }" if (!button->isDown()) button->setStyleSheet(button_css);
"QPushButton:hover { background-color: %2; }" }
"QPushButton:pressed { background-color: %3; }" }
).arg(hue_hex).arg(hue_light).arg(hue_dark)); if (ui->trim_xci_button && !ui->trim_xci_button->isDown()) {
ui->trim_xci_button->setStyleSheet(button_css);
} }
// 4. Tab Content Area // 4. Tab Content Area
@@ -374,7 +375,25 @@ void ConfigurePerGame::UpdateTheme() {
}); });
} }
rainbow_timer->start(33); rainbow_timer->start(33);
} else if (rainbow_timer) { }
// Fix for Gamescope: Style buttons once outside the timer loop
if (ui->buttonBox) {
ui->buttonBox->setStyleSheet(QStringLiteral(
"QPushButton { background-color: %1; color: #ffffff; border-radius: 4px; font-weight: bold; padding: 5px 15px; }"
"QPushButton:hover { background-color: %2; }"
"QPushButton:pressed { background-color: %3; }"
).arg(accent).arg(Theme::GetAccentColorHover()).arg(Theme::GetAccentColorPressed()));
}
if (ui->trim_xci_button) {
ui->trim_xci_button->setStyleSheet(QStringLiteral(
"QPushButton { background-color: %1; color: #ffffff; border: none; border-radius: 4px; padding: 10px; }"
"QPushButton:hover { background-color: %2; }"
"QPushButton:pressed { background-color: %3; }"
).arg(accent).arg(Theme::GetAccentColorHover()).arg(Theme::GetAccentColorPressed()));
}
if (UISettings::values.enable_rainbow_mode.GetValue() == false && rainbow_timer) {
rainbow_timer->stop(); rainbow_timer->stop();
if (ui->tabButtonsContainer) ui->tabButtonsContainer->setStyleSheet({}); if (ui->tabButtonsContainer) ui->tabButtonsContainer->setStyleSheet({});
if (ui->tabButtonsScrollArea) ui->tabButtonsScrollArea->setStyleSheet({}); if (ui->tabButtonsScrollArea) ui->tabButtonsScrollArea->setStyleSheet({});
@@ -551,8 +570,7 @@ void ConfigurePerGame::LoadConfiguration() {
} }
} }
} }
} catch (...) { } catch (...) {}
}
} }
try { try {
@@ -610,17 +628,18 @@ void ConfigurePerGame::LoadConfiguration() {
} }
} }
} }
} catch (...) { } catch (...) {}
}
const auto& system_build_id = system.GetApplicationProcessBuildID(); if (system.IsPoweredOn()) {
const auto system_build_id_hex = Common::HexToString(system_build_id, false); const auto& system_build_id = system.GetApplicationProcessBuildID();
const auto system_build_id_hex = Common::HexToString(system_build_id, false);
if (!system_build_id_hex.empty() && system_build_id_hex != std::string(64, '0')) { if (!system_build_id_hex.empty() && system_build_id_hex != std::string(64, '0')) {
if (!base_build_id_hex.empty() && system_build_id_hex != base_build_id_hex) { if (!base_build_id_hex.empty() && system_build_id_hex != base_build_id_hex) {
update_build_id_hex = system_build_id_hex; update_build_id_hex = system_build_id_hex;
} else if (base_build_id_hex.empty()) { } else if (base_build_id_hex.empty()) {
base_build_id_hex = system_build_id_hex; base_build_id_hex = system_build_id_hex;
}
} }
} }
@@ -863,15 +882,15 @@ void ConfigurePerGame::AnimateTabSwitch(int id) {
current_widget->hide(); current_widget->hide();
current_widget->move(0, 0); current_widget->move(0, 0);
m_is_tab_animating = false; // Reset the flag m_is_tab_animating = false;
for (auto button : button_group->buttons()) { for (auto button : button_group->buttons()) {
button->setEnabled(true); button->setEnabled(true);
} }
}); });
m_is_tab_animating = true; // Set the flag m_is_tab_animating = true;
for (auto button : button_group->buttons()) { for (auto button : button_group->buttons()) {
button->setEnabled(false); button->setEnabled(false);
} }
animation_group->start(QAbstractAnimation::DeleteWhenStopped); animation_group->start(QAbstractAnimation::DeleteWhenStopped);
} }