mewin/nana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix a color issue

Browse Source
This commit is contained in:
Jinhao 2015-09-10 23:36:16 +08:00
parent 5c6c0ddcd1
commit edd7de4e8b
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/detail/linux_X11/platform_spec.cpp
View File

@ -304,12 +304,12 @@ namespace detail
void drawable_impl_type::set_color(const ::nana::color& clr) void drawable_impl_type::set_color(const ::nana::color& clr)
{ {
color_ = clr.px_color().value; color_ = (clr.px_color().value & 0xFFFFFF);
} }
void drawable_impl_type::set_text_color(const ::nana::color& clr) void drawable_impl_type::set_text_color(const ::nana::color& clr)
{ {
text_color_ = clr.px_color().value; text_color_ = (clr.px_color().value & 0xFFFFFF);
update_text_color(); update_text_color();
} }

4
source/detail/win32/platform_spec.cpp
View File

@ -65,12 +65,12 @@ namespace detail
void drawable_impl_type::set_color(const ::nana::color& clr) void drawable_impl_type::set_color(const ::nana::color& clr)
{ {
color_ = clr.px_color().value; color_ = (clr.px_color().value & 0xFFFFFF);
} }
void drawable_impl_type::set_text_color(const ::nana::color& clr) void drawable_impl_type::set_text_color(const ::nana::color& clr)
{ {
auto rgb = clr.px_color().value; auto rgb = (clr.px_color().value & 0xFFFFFF);
if (text_color_ != rgb) if (text_color_ != rgb)
{ {
::SetTextColor(context, NANA_RGB(rgb)); ::SetTextColor(context, NANA_RGB(rgb));