Skip to content

fix: settings list items not properly using theme colors #348

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
frysee merged 1 commit into from
May 19, 2025
Merged

fix: settings list items not properly using theme colors #348

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions workspace/all/settings/menu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -565,7 +565,7 @@ void MenuList::drawList(SDL_Surface *surface, const SDL_Rect &dst)

void MenuList::drawListItem(SDL_Surface *surface, const SDL_Rect &dst, const MenuItem &item, bool selected)
{
SDL_Color text_color = COLOR_WHITE;
SDL_Color text_color = uintToColour(THEME_COLOR4_255);
SDL_Surface *text;

// int ox = (dst.w - w) / 2; // if we're centering these (but I don't think we should after seeing it)
Expand Down Expand Up @@ -623,6 +623,7 @@ namespace
void MenuList::drawFixedItem(SDL_Surface *surface, const SDL_Rect &dst, const MenuItem &item, bool selected)
{
SDL_Color text_color = uintToColour(THEME_COLOR4_255);
SDL_Color text_color_value = uintToColour(THEME_COLOR4_255);
SDL_Surface *text;

// hack - this should be correlated to max_width
Expand All @@ -636,7 +637,7 @@ void MenuList::drawFixedItem(SDL_Surface *surface, const SDL_Rect &dst, const Me

if (item.getValue().has_value())
{
text = TTF_RenderUTF8_Blended(font.tiny, item.getLabel().c_str(), COLOR_WHITE); // always white
text = TTF_RenderUTF8_Blended(font.tiny, item.getLabel().c_str(), text_color_value);

if (item.getType() == ListItemType::Color)
{
Expand Down