lisyarus/psemek
1
0
Fork 1
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Bugfix: ui style merging should merge fonts as well

Browse source
This commit is contained in:
Nikita Lisitsa 2021-03-03 10:59:04 +03:00
parent b37d2d25c7
commit 0b30163ed1
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
libs/ui/source/style.cpp
View file

@ -9,6 +9,12 @@ namespace psemek::ui
if (!dst) dst = src; if (!dst) dst = src;
} }
template <typename T>
void merge(std::shared_ptr<T> & dst, std::shared_ptr<T> const & src)
{
if (!dst) dst = src;
}
void merge(style & dst, style const & src) void merge(style & dst, style const & src)
{ {
merge(dst.bg_color, src.bg_color); merge(dst.bg_color, src.bg_color);
@ -24,6 +30,7 @@ namespace psemek::ui
merge(dst.text_color, src.text_color); merge(dst.text_color, src.text_color);
merge(dst.text_scale, src.text_scale); merge(dst.text_scale, src.text_scale);
merge(dst.text_shadow_offset, src.text_shadow_offset); merge(dst.text_shadow_offset, src.text_shadow_offset);
merge(dst.font, src.font);
} }
style default_style() style default_style()