The-Homebrew-Cloud/Cemu
2
0
Fork 0
mirror of https://github.com/cemu-project/Cemu.git synced 2024-11-26 02:54:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use system color definitions for wxGameList (#241)

Browse Source 
Previously it would use hard-coded bright colors which clashed with dark themes on Linux
This commit is contained in:
Shoegzer 2022-09-16 19:06:36 -04:00 committed by GitHub
parent 63206eb9a8
commit 6ef36152c2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 59 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
src/gui/components/wxGameList.cpp
View File

@ -71,8 +71,8 @@ wxGameList::wxGameList(wxWindow* parent, wxWindowID id)
m_tooltip_window->SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_INFOBK)); m_tooltip_window->SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_INFOBK));
m_tooltip_window->SetSizerAndFit(tooltip_sizer); m_tooltip_window->SetSizerAndFit(tooltip_sizer);
m_tooltip_window->Hide(); m_tooltip_window->Hide();
m_tooltip_timer = new wxTimer(this); m_tooltip_timer = new wxTimer(this);
Bind(wxEVT_CLOSE_WINDOW, &wxGameList::OnClose, this); Bind(wxEVT_CLOSE_WINDOW, &wxGameList::OnClose, this);
Bind(wxEVT_MOTION, &wxGameList::OnMouseMove, this); Bind(wxEVT_MOTION, &wxGameList::OnMouseMove, this);
@ -125,16 +125,16 @@ void wxGameList::LoadConfig()
{ {
wxArrayInt order; wxArrayInt order;
order.reserve(ColumnFavorite); order.reserve(ColumnFavorite);
const auto order_string = std::string_view(config.game_list_column_order).substr(1); const auto order_string = std::string_view(config.game_list_column_order).substr(1);
const boost::char_separator<char> sep(","); const boost::char_separator<char> sep(",");
boost::tokenizer tokens(order_string.begin(), order_string.end(), sep); boost::tokenizer tokens(order_string.begin(), order_string.end(), sep);
for(const auto& token : tokens) for(const auto& token : tokens)
{ {
order.push_back(ConvertString<int>(token, 10)); order.push_back(ConvertString<int>(token, 10));
} }
#ifdef wxHAS_LISTCTRL_COLUMN_ORDER #ifdef wxHAS_LISTCTRL_COLUMN_ORDER
if(order.GetCount() == ColumnFavorite) if(order.GetCount() == ColumnFavorite)
SetColumnsOrder(order); SetColumnsOrder(order);
@ -209,10 +209,10 @@ void wxGameList::SetStyle(Style style, bool save)
return; return;
wxWindowUpdateLocker updatelock(this); wxWindowUpdateLocker updatelock(this);
m_style = style; m_style = style;
SetWindowStyleFlag(GetStyleFlags(m_style)); SetWindowStyleFlag(GetStyleFlags(m_style));
uint64 selected_title_id = 0; uint64 selected_title_id = 0;
auto selection = GetNextItem(wxNOT_FOUND, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED); auto selection = GetNextItem(wxNOT_FOUND, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
if (selection != wxNOT_FOUND) if (selection != wxNOT_FOUND)
@ -230,7 +230,7 @@ void wxGameList::SetStyle(Style style, bool save)
wxListCtrl::SetImageList(m_image_list_small, wxIMAGE_LIST_NORMAL); wxListCtrl::SetImageList(m_image_list_small, wxIMAGE_LIST_NORMAL);
break; break;
} }
ReloadGameEntries(); ReloadGameEntries();
SortEntries(); SortEntries();
UpdateItemColors(); UpdateItemColors();
@ -269,16 +269,42 @@ long wxGameList::GetStyleFlags(Style style) const
void wxGameList::UpdateItemColors(sint32 startIndex) void wxGameList::UpdateItemColors(sint32 startIndex)
{ {
wxWindowUpdateLocker lock(this);
for (int i = startIndex; i < GetItemCount(); ++i) wxWindowUpdateLocker lock(this);
{
const auto titleId = (uint64)GetItemData(i); // Get the background color so we can determine the theme in use
const wxColour bgColour = GetBackgroundColour();
for (int i = startIndex; i < GetItemCount(); ++i)
{
const auto titleId = (uint64)GetItemData(i);
if (GetConfig().IsGameListFavorite(titleId))//entry->favorite) if (GetConfig().IsGameListFavorite(titleId))//entry->favorite)
{
SetItemBackgroundColour(i, kFavoriteColor); SetItemBackgroundColour(i, kFavoriteColor);
SetItemTextColour(i, 0x000000UL);
}
else if ((i&1) != 0) else if ((i&1) != 0)
SetItemBackgroundColour(i, kSecondColor); {
// Depending on the background RGB value:
// Light theme row color will be 10% darker (90)
// Dark theme row color will be 10% brighter (110)
int alpha = bgColour.GetRGB() > 0x808080 ? 90 : 110;
SetItemBackgroundColour(i, bgColour.ChangeLightness(alpha));
// Text can be changed to other values for alternating rows if needed
SetItemTextColour(i, wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT));
}
else else
SetItemBackgroundColour(i, 0xFFFFFFUL); {
// Depending on the background RGB value:
// Light theme row color will be 0% darker (100)
// Dark theme row color will be 0% brighter (100)
int alpha = bgColour.GetRGB() > 0x808080 ? 100 : 100;
SetItemBackgroundColour(i, bgColour.ChangeLightness(alpha));
// Text color can be modified to other values for alternating rows if needed
SetItemTextColour(i, wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT));
}
} }
} }
@ -309,7 +335,7 @@ int wxGameList::SortFunction(wxIntPtr item1, wxIntPtr item2, wxIntPtr sortData)
{ {
const auto sort_data = (SortData*)sortData; const auto sort_data = (SortData*)sortData;
const int dir = sort_data->dir; const int dir = sort_data->dir;
return sort_data->thisptr->SortComparator((uint64)item1, (uint64)item2, sort_data); return sort_data->thisptr->SortComparator((uint64)item1, (uint64)item2, sort_data);
} }
@ -331,7 +357,7 @@ void wxGameList::SortEntries(int column)
s_direction = 1; s_direction = 1;
} }
} }
switch (column) switch (column)
{ {
case ColumnName: case ColumnName:
@ -349,7 +375,7 @@ void wxGameList::SortEntries(int column)
void wxGameList::CreateListColumns() void wxGameList::CreateListColumns()
{ {
DeleteAllColumns(); DeleteAllColumns();
const auto& config = GetConfig(); const auto& config = GetConfig();
wxListItem col0; wxListItem col0;
col0.SetId(ColumnHiddenName); col0.SetId(ColumnHiddenName);
@ -392,7 +418,7 @@ void wxGameList::CreateListColumns()
col6.SetText(_("Last played")); col6.SetText(_("Last played"));
col6.SetWidth(config.column_width.game_started); col6.SetWidth(config.column_width.game_started);
InsertColumn(ColumnGameStarted, col6); InsertColumn(ColumnGameStarted, col6);
wxListItem col7; wxListItem col7;
col7.SetId(ColumnRegion); col7.SetId(ColumnRegion);
col7.SetText(_("Region")); col7.SetText(_("Region"));
@ -405,7 +431,7 @@ void wxGameList::OnKeyDown(wxListEvent& event)
event.Skip(); event.Skip();
if (m_style != Style::kList) if (m_style != Style::kList)
return; return;
const auto keycode = std::tolower(event.m_code); const auto keycode = std::tolower(event.m_code);
if (keycode == WXK_LEFT) if (keycode == WXK_LEFT)
{ {
@ -445,12 +471,12 @@ void wxGameList::OnKeyDown(wxListEvent& event)
enum ContextMenuEntries enum ContextMenuEntries
{ {
kContextMenuRefreshGames = wxID_HIGHEST + 1, kContextMenuRefreshGames = wxID_HIGHEST + 1,
kContextMenuStart, kContextMenuStart,
kWikiPage, kWikiPage,
kContextMenuFavorite, kContextMenuFavorite,
kContextMenuEditName, kContextMenuEditName,
kContextMenuGameFolder, kContextMenuGameFolder,
kContextMenuSaveFolder, kContextMenuSaveFolder,
kContextMenuUpdateFolder, kContextMenuUpdateFolder,
@ -465,10 +491,10 @@ enum ContextMenuEntries
void wxGameList::OnContextMenu(wxContextMenuEvent& event) void wxGameList::OnContextMenu(wxContextMenuEvent& event)
{ {
auto& config = GetConfig(); auto& config = GetConfig();
wxMenu menu; wxMenu menu;
menu.Bind(wxEVT_COMMAND_MENU_SELECTED, &wxGameList::OnContextMenuSelected, this); menu.Bind(wxEVT_COMMAND_MENU_SELECTED, &wxGameList::OnContextMenuSelected, this);
const auto selection = GetNextItem(-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED); const auto selection = GetNextItem(-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
if (selection != wxNOT_FOUND) if (selection != wxNOT_FOUND)
{ {
@ -486,18 +512,18 @@ void wxGameList::OnContextMenu(wxContextMenuEvent& event)
menu.AppendSeparator(); menu.AppendSeparator();
menu.AppendCheckItem(kContextMenuFavorite, _("&Favorite"))->Check(isFavorite); menu.AppendCheckItem(kContextMenuFavorite, _("&Favorite"))->Check(isFavorite);
menu.Append(kContextMenuEditName, _("&Edit name")); menu.Append(kContextMenuEditName, _("&Edit name"));
menu.AppendSeparator(); menu.AppendSeparator();
menu.Append(kWikiPage, _("&Wiki page")); menu.Append(kWikiPage, _("&Wiki page"));
menu.Append(kContextMenuGameFolder, _("&Game directory")); menu.Append(kContextMenuGameFolder, _("&Game directory"));
menu.Append(kContextMenuSaveFolder, _("&Save directory"))->Enable(fs::is_directory(gameInfo.GetSaveFolder(), ec)); menu.Append(kContextMenuSaveFolder, _("&Save directory"))->Enable(fs::is_directory(gameInfo.GetSaveFolder(), ec));
menu.Append(kContextMenuUpdateFolder, _("&Update directory"))->Enable(gameInfo.HasUpdate()); menu.Append(kContextMenuUpdateFolder, _("&Update directory"))->Enable(gameInfo.HasUpdate());
menu.Append(kContextMenuDLCFolder, _("&DLC directory"))->Enable(gameInfo.HasAOC()); menu.Append(kContextMenuDLCFolder, _("&DLC directory"))->Enable(gameInfo.HasAOC());
menu.AppendSeparator(); menu.AppendSeparator();
menu.Append(kContextMenuEditGraphicPacks, _("&Edit graphic packs")); menu.Append(kContextMenuEditGraphicPacks, _("&Edit graphic packs"));
menu.Append(kContextMenuEditGameProfile, _("&Edit game profile")); menu.Append(kContextMenuEditGameProfile, _("&Edit game profile"));
menu.AppendSeparator(); menu.AppendSeparator();
} }
} }
@ -581,7 +607,7 @@ void wxGameList::OnContextMenuSelected(wxCommandEvent& event)
} }
break; break;
} }
case kContextMenuSaveFolder: case kContextMenuSaveFolder:
{ {
wxLaunchDefaultBrowser(wxHelper::FromUtf8(fmt::format("file:{}", _pathToUtf8(gameInfo.GetSaveFolder())))); wxLaunchDefaultBrowser(wxHelper::FromUtf8(fmt::format("file:{}", _pathToUtf8(gameInfo.GetSaveFolder()))));
@ -647,7 +673,7 @@ void wxGameList::OnColumnRightClick(wxListEvent& event)
{ {
ResetWidth = wxID_HIGHEST + 1, ResetWidth = wxID_HIGHEST + 1,
ResetOrder, ResetOrder,
ShowName, ShowName,
ShowVersion, ShowVersion,
ShowDlc, ShowDlc,
@ -658,10 +684,10 @@ void wxGameList::OnColumnRightClick(wxListEvent& event)
const int column = event.GetColumn(); const int column = event.GetColumn();
wxMenu menu; wxMenu menu;
menu.SetClientObject(new wxCustomData(column)); menu.SetClientObject(new wxCustomData(column));
menu.Append(ResetWidth, _("Reset &width")); menu.Append(ResetWidth, _("Reset &width"));
menu.Append(ResetOrder, _("Reset &order")) ; menu.Append(ResetOrder, _("Reset &order")) ;
menu.AppendSeparator(); menu.AppendSeparator();
menu.AppendCheckItem(ShowName, _("Show &name"))->Check(GetColumnWidth(ColumnName) > 0); menu.AppendCheckItem(ShowName, _("Show &name"))->Check(GetColumnWidth(ColumnName) > 0);
menu.AppendCheckItem(ShowVersion, _("Show &version"))->Check(GetColumnWidth(ColumnVersion) > 0); menu.AppendCheckItem(ShowVersion, _("Show &version"))->Check(GetColumnWidth(ColumnVersion) > 0);
@ -758,7 +784,7 @@ void wxGameList::ApplyGameListColumnWidths()
else else
this->SetColumnWidth(id, width); this->SetColumnWidth(id, width);
}; };
const auto& config = GetConfig(); const auto& config = GetConfig();
wxWindowUpdateLocker lock(this); wxWindowUpdateLocker lock(this);
set_width(ColumnName, config.column_width.name); set_width(ColumnName, config.column_width.name);
@ -943,7 +969,7 @@ void wxGameList::OnItemActivated(wxListEvent& event)
wxPostEvent(this, open_settings_event); wxPostEvent(this, open_settings_event);
return; return;
} }
TitleInfo titleInfo; TitleInfo titleInfo;
if (!CafeTitleList::GetFirstByTitleId(item_data, titleInfo)) if (!CafeTitleList::GetFirstByTitleId(item_data, titleInfo))
return; return;
@ -974,7 +1000,7 @@ void wxGameList::OnTimer(wxTimerEvent& event)
//} //}
} }
} }
} }
void wxGameList::OnMouseMove(wxMouseEvent& event) void wxGameList::OnMouseMove(wxMouseEvent& event)