Emulator-Archive/Cemu-Android
1
0
Fork 0
mirror of https://github.com/SSimco/Cemu.git synced 2024-11-23 21:39:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix various colour values for dark themes (#439)

Browse Source
This commit is contained in:
goeiecool9999 2022-11-13 08:27:09 +01:00 committed by GitHub
parent 94b179ef5a
commit 2842615edb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 28 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/MainWindow.cpp
View File

@ -1696,8 +1696,6 @@ public:
{
SetIcon(wxICON(M_WND_ICON128));
this->SetBackgroundColour(wxColour(0xFFFFFFFF));
wxScrolledWindow* scrolledWindow = new wxScrolledWindow(this);
wxBoxSizer* mainSizer = new wxBoxSizer(wxVERTICAL);

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

@ -358,16 +358,9 @@ long wxGameList::GetStyleFlags(Style style) const
void wxGameList::UpdateItemColors(sint32 startIndex)
{
wxWindowUpdateLocker lock(this);
// get the background color so we can determine the theme in use
wxColour bgColour = GetBackgroundColour();
uint32 bgLightness = (bgColour.GetRed() + bgColour.GetGreen() + bgColour.GetBlue()) / 3;
bool isDarkTheme = bgLightness < 128;
wxColour bgColourPrimary = bgColour; // color for odd rows
wxColour bgColourSecondary = bgColour.ChangeLightness(isDarkTheme ? 110 : 90); // color for even rows
// for very light themes we'll use a blue tint to match the older Windows Cemu look
if (bgLightness > 250)
bgColourSecondary = wxColour(bgColour.Red() - 13, bgColour.Green() - 6, bgColour.Blue() - 2);
wxColour bgColourPrimary = GetBackgroundColour();
wxColour bgColourSecondary = wxHelper::CalculateAccentColour(bgColourPrimary);
for (int i = startIndex; i < GetItemCount(); ++i)
{
@ -1143,4 +1136,4 @@ bool wxGameList::QueryIconForTitle(TitleId titleId, int& icon, int& iconSmall)
void wxGameList::DeleteCachedStrings()
{
m_name_cache.clear();
}
}

11
src/gui/components/wxTitleManagerList.cpp
View File

@ -172,10 +172,11 @@ wxString wxTitleManagerList::OnGetItemText(long item, long column) const
wxItemAttr* wxTitleManagerList::OnGetItemAttr(long item) const
{
const auto entry = GetTitleEntry(item);
const wxColour kSecondColor{ 0xFDF9F2 };
static wxListItemAttr s_coloured_attr(GetTextColour(), kSecondColor, GetFont());
return item % 2 == 0 ? nullptr : &s_coloured_attr;
static wxColour bgColourPrimary = GetBackgroundColour();
static wxColour bgColourSecondary = wxHelper::CalculateAccentColour(bgColourPrimary);
static wxListItemAttr s_primary_attr(GetTextColour(), bgColourPrimary, GetFont());
static wxListItemAttr s_secondary_attr(GetTextColour(), bgColourSecondary, GetFont());
return item % 2 == 0 ? &s_primary_attr : &s_secondary_attr;
}
boost::optional<wxTitleManagerList::TitleEntry&> wxTitleManagerList::GetTitleEntry(long item)
@ -1274,4 +1275,4 @@ void wxTitleManagerList::ClearItems()
void wxTitleManagerList::AutosizeColumns()
{
wxAutosizeColumns(this, ColumnTitleId, ColumnMAX - 1);
}
}

8
src/gui/input/panels/InputPanel.h
View File

@ -5,6 +5,8 @@
#include "input/emulated/EmulatedController.h"
#include "input/api/Controller.h"
#include "gui/wxHelper.h"
class ControllerBase;
class wxTextCtrl;
class wxComboBox;
@ -12,9 +14,15 @@ class wxComboBox;
class InputPanel : public wxPanel
{
public:
#if BOOST_OS_WINDOWS
const wxColour kKeyColourNormalMode = 0xfafafa;
const wxColour kKeyColourEditMode = 0x99ccff;
const wxColour kKeyColourActiveMode = 0xE0E0E0;
#else
const wxColour kKeyColourNormalMode = GetBackgroundColour();
const wxColour kKeyColourEditMode = GetBackgroundColour();
const wxColour kKeyColourActiveMode = wxHelper::CalculateAccentColour(kKeyColourNormalMode);
#endif
InputPanel(wxWindow* parent);

11
src/gui/wxHelper.h
View File

@ -22,5 +22,16 @@ namespace wxHelper
return wxString::FromUTF8(str.data(), str.size());
}
inline wxColour CalculateAccentColour(const wxColour& bgColour)
{
wxColour bgColourSecondary;
const uint32 bgLightness = (bgColour.GetRed() + bgColour.GetGreen() + bgColour.GetBlue()) / 3;
const bool isDarkTheme = bgLightness < 128;
bgColourSecondary = bgColour.ChangeLightness(isDarkTheme ? 110 : 90); // color for even rows
// for very light themes we'll use a blue tint to match the older Windows Cemu look
if (bgLightness > 250)
bgColourSecondary = wxColour(bgColour.Red() - 13, bgColour.Green() - 6, bgColour.Blue() - 2);
return bgColourSecondary;
}
};