fix a color issue

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

View File

@ -304,12 +304,12 @@ namespace detail
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)
{
text_color_ = clr.px_color().value;
text_color_ = (clr.px_color().value & 0xFFFFFF);
update_text_color();
}

View File

@ -65,12 +65,12 @@ namespace detail
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)
{
auto rgb = clr.px_color().value;
auto rgb = (clr.px_color().value & 0xFFFFFF);
if (text_color_ != rgb)
{
::SetTextColor(context, NANA_RGB(rgb));