Skip to content

Accept struct color types in setBaseColor() and setTextColor() #358

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
lovyan03 merged 1 commit into from
Oct 15, 2026
Merged

Accept struct color types in setBaseColor() and setTextColor() #358

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
8 changes: 4 additions & 4 deletions src/lgfx/v1/LGFXBase.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ namespace lgfx
LGFX_INLINE_T void setColor(T color) { setRawColor(_write_conv.convert(color)); }
LGFX_INLINE void setRawColor(uint32_t c) { *((uint32_t*)&_color) = c; }
LGFX_INLINE uint32_t getRawColor(void) const { return *((uint32_t*)&_color); }
LGFX_INLINE_T void setBaseColor(T c) { _base_rgb888 = hasPalette() ? c : convert_to_rgb888(c); }
LGFX_INLINE_T void setBaseColor(T c) { _base_rgb888 = hasPalette() ? static_cast<uint32_t>(c) : convert_to_rgb888(c); }
LGFX_INLINE uint32_t getBaseColor(void) const { return _base_rgb888; }
LGFX_INLINE color_conv_t* getColorConverter(void) { return &_write_conv; }
LGFX_INLINE color_depth_t getColorDepth(void) const { return _write_conv.depth; }
Expand Down Expand Up @@ -690,16 +690,16 @@ namespace lgfx

template<typename T>
void setTextColor(T color) {
_text_style.fore_rgb888 = _text_style.back_rgb888 = this->hasPalette() ? color : convert_to_rgb888(color);
_text_style.fore_rgb888 = _text_style.back_rgb888 = this->hasPalette() ? static_cast<uint32_t>(color) : convert_to_rgb888(color);
}
template<typename T1, typename T2>
void setTextColor(T1 fgcolor, T2 bgcolor) {
if (!this->hasPalette()) {
_text_style.fore_rgb888 = convert_to_rgb888(fgcolor);
_text_style.back_rgb888 = convert_to_rgb888(bgcolor);
} else {
_text_style.fore_rgb888 = fgcolor;
_text_style.back_rgb888 = bgcolor;
_text_style.fore_rgb888 = static_cast<uint32_t>(fgcolor);
_text_style.back_rgb888 = static_cast<uint32_t>(bgcolor);
}
}

Expand Down
Loading