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

Merge branch 'hotfix-1.5.1' into develop

Browse Source
This commit is contained in:
Jinhao
2017-06-08 21:40:32 +08:00
parent 4d93c97c44 bd38e96ed7
commit 3cefaa3506
11 changed files with 43 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source/paint/graphics.cpp
View File

@@ -1205,7 +1205,8 @@ namespace paint
unsigned last_color = (int(r) << 16) | (int(g) << 8) | int(b);
Display * disp = nana::detail::platform_spec::instance().open_display();
impl_->handle->fgcolor(static_cast<color_rgb>(last_color));
impl_->handle->set_color(static_cast<color_rgb>(last_color));
impl_->handle->update_color();
const int endpos = deltapx + (vertical ? rct.y : rct.x);
if (endpos > 0)
{
@@ -1220,7 +1221,8 @@ namespace paint
if (new_color != last_color)
{
last_color = new_color;
impl_->handle->fgcolor(static_cast<color_rgb>(last_color));
impl_->handle->set_color(static_cast<color_rgb>(last_color));
impl_->handle->update_color();
}
}
}
@@ -1235,7 +1237,8 @@ namespace paint
if (new_color != last_color)
{
last_color = new_color;
impl_->handle->fgcolor(static_cast<color_rgb>(last_color));
impl_->handle->set_color(static_cast<color_rgb>(last_color));
impl_->handle->update_color();
}
}
}