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

Merge pull request 'fix(ui): Consistent Accent Coloring across various UI elements' (#117) from fix/colors into main

Browse Source 
Reviewed-on: https://git.citron-emu.org/Citron/Emulator/pulls/117
This commit is contained in:
Collecting
2026-01-30 22:53:30 +01:00
parent 2272b62171 87e9352444
commit 4568f63570
2 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/citron/game_list.cpp
View File

@@ -392,19 +392,7 @@ GameListSearchField::GameListSearchField(GameList* parent) : QWidget{parent} {
edit_filter->clear(); edit_filter->clear();
edit_filter->installEventFilter(key_release_eater); edit_filter->installEventFilter(key_release_eater);
edit_filter->setClearButtonEnabled(true); edit_filter->setClearButtonEnabled(true);
// Add rounded corners styling to the search field
edit_filter->setStyleSheet(QStringLiteral(
"QLineEdit {"
" border: 1px solid palette(mid);"
" border-radius: 6px;"
" padding: 4px 8px;"
" background: palette(base);"
"}"
"QLineEdit:focus {"
" border: 1px solid palette(highlight);"
" background: palette(base);"
"}"
));
connect(edit_filter, &QLineEdit::textChanged, parent, &GameList::OnTextChanged); connect(edit_filter, &QLineEdit::textChanged, parent, &GameList::OnTextChanged);
label_filter_result = new QLabel; label_filter_result = new QLabel;
button_filter_close = new QToolButton(this); button_filter_close = new QToolButton(this);
@@ -2305,7 +2293,7 @@ void GameList::UpdateAccentColorStyles() {
.arg(hover_background_color.alpha()); .arg(hover_background_color.alpha());
QString accent_style = QStringLiteral( QString accent_style = QStringLiteral(
/* Tree View (List View) Selection & Hover Style - Final */ /* Tree View (List View) Selection & Hover Style */
"QTreeView::item:hover {" "QTreeView::item:hover {"
" background-color: %3;" /* Use the new accent-based hover color */ " background-color: %3;" /* Use the new accent-based hover color */
" border-radius: 4px;" /* Add a subtle rounding to the hover effect */ " border-radius: 4px;" /* Add a subtle rounding to the hover effect */
@@ -2321,7 +2309,7 @@ void GameList::UpdateAccentColorStyles() {
" border: none;" /* NO BORDER */ " border: none;" /* NO BORDER */
"}" "}"
/* List View (Grid View) Selection Style - This remains correct */ /* List View (Grid View) Selection Style */
"QListView::item:selected {" "QListView::item:selected {"
" background-color: palette(light);" " background-color: palette(light);"
" border: 3px solid %1;" " border: 3px solid %1;"
@@ -2371,6 +2359,19 @@ void GameList::UpdateAccentColorStyles() {
btn_list_view->setStyleSheet(button_base_style + button_checked_style); btn_list_view->setStyleSheet(button_base_style + button_checked_style);
btn_grid_view->setStyleSheet(button_base_style + button_checked_style); btn_grid_view->setStyleSheet(button_base_style + button_checked_style);
search_field->setStyleSheet(QStringLiteral(
"QLineEdit {"
" border: 1px solid palette(mid);"
" border-radius: 6px;"
" padding: 4px 8px;"
" background: palette(base);"
"}"
"QLineEdit:focus {"
" border: 1px solid %1;"
" background: palette(base);"
"}"
).arg(color_name));
} }
void GameList::ToggleHidden(const QString& path) { void GameList::ToggleHidden(const QString& path) {
@@ -2414,4 +2415,8 @@ void GameList::OnEmulationEnded() {
fade_out_anim->start(QAbstractAnimation::DeleteWhenStopped); fade_out_anim->start(QAbstractAnimation::DeleteWhenStopped);
} }
void GameListSearchField::setStyleSheet(const QString& sheet) {
edit_filter->setStyleSheet(sheet);
}
#include "game_list.moc" #include "game_list.moc"

1
src/citron/game_list_p.h
View File

@@ -430,6 +430,7 @@ public:
void clear(); void clear();
void setFocus(); void setFocus();
void setStyleSheet(const QString& sheet);
private: private:
void changeEvent(QEvent*) override; void changeEvent(QEvent*) override;