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

reduce GDI objects

Browse Source
This commit is contained in:
Jinhao
2017-08-13 15:48:57 +08:00
parent c8bbf03ebf
commit 6da703c8fb
3 changed files with 38 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
source/paint/graphics.cpp
View File

@@ -332,7 +332,6 @@ namespace paint
dw->context = cdc;
dw->pixmap = bmp;
::SetBkMode(cdc, TRANSPARENT);
dw->brush.set(cdc, dw->brush.Solid, 0xFFFFFF);
}
else
{
@@ -1075,13 +1074,17 @@ namespace paint
{
if (!impl_->handle) return;
#if defined(NANA_WINDOWS)
impl_->handle->update_pen();
if (pos1 != pos2)
{
auto pen = ::CreatePen(PS_SOLID, 1, NANA_RGB(impl_->handle->get_color()));
::DeleteObject(::SelectObject(impl_->handle->context, pen));
::MoveToEx(impl_->handle->context, pos1.x, pos1.y, 0);
::LineTo(impl_->handle->context, pos2.x, pos2.y);
DeleteObject(pen);
}
::SetPixel(impl_->handle->context, pos2.x, pos2.y, NANA_RGB(impl_->handle->pen.color));
::SetPixel(impl_->handle->context, pos2.x, pos2.y, NANA_RGB(impl_->handle->get_color()));
#elif defined(NANA_X11)
Display* disp = nana::detail::platform_spec::instance().open_display();
impl_->handle->update_color();
@@ -1107,8 +1110,12 @@ namespace paint
{
if (!impl_->handle) return;
#if defined(NANA_WINDOWS)
impl_->handle->update_pen();
auto pen = ::CreatePen(PS_SOLID, 1, NANA_RGB(impl_->handle->get_color()));
::DeleteObject(::SelectObject(impl_->handle->context, pen));
::LineTo(impl_->handle->context, pos.x, pos.y);
DeleteObject(pen);
#elif defined(NANA_X11)
Display* disp = nana::detail::platform_spec::instance().open_display();
impl_->handle->update_color();
@@ -1136,9 +1143,14 @@ namespace paint
if (r.width && r.height && impl_->handle && r.right() > 0 && r.bottom() > 0)
{
#if defined(NANA_WINDOWS)
auto brush = ::CreateSolidBrush(NANA_RGB(impl_->handle->get_color()));
::RECT native_r = { r.x, r.y, r.right(), r.bottom()};
impl_->handle->update_brush();
(solid ? ::FillRect : ::FrameRect)(impl_->handle->context, &native_r, impl_->handle->brush.handle);
(solid ? ::FillRect : ::FrameRect)(impl_->handle->context, &native_r, brush);
::DeleteObject(brush);
#elif defined(NANA_X11)
Display* disp = nana::detail::platform_spec::instance().open_display();
impl_->handle->update_color();
@@ -1263,17 +1275,31 @@ namespace paint
{
#if defined(NANA_WINDOWS)
impl_->handle->set_color(clr);
if (solid)
{
impl_->handle->update_pen();
impl_->handle->brush.set(impl_->handle->context, impl_->handle->brush.Solid, solid_clr.px_color().value);
auto pen = ::CreatePen(PS_SOLID, 1, NANA_RGB(impl_->handle->get_color()));
::DeleteObject(::SelectObject(impl_->handle->context, pen));
auto brush = ::CreateSolidBrush(solid_clr.px_color().value);
auto pr_brush = ::SelectObject(impl_->handle->context, brush);
::RoundRect(impl_->handle->context, r.x, r.y, r.right(), r.bottom(), static_cast<int>(radius_x * 2), static_cast<int>(radius_y * 2));
::DeleteObject(::SelectObject(impl_->handle->context, pr_brush));
DeleteObject(pen);
}
else
{
impl_->handle->update_brush();
impl_->handle->round_region.set(r, radius_x, radius_y);
::FrameRgn(impl_->handle->context, impl_->handle->round_region.handle, impl_->handle->brush.handle, 1, 1);
auto brush = ::CreateSolidBrush(NANA_RGB(impl_->handle->get_color()));
auto region = ::CreateRoundRectRgn(r.x, r.y, r.x + static_cast<int>(r.width) + 1, r.y + static_cast<int>(r.height) + 1, static_cast<int>(radius_x + 1), static_cast<int>(radius_y + 1));
::FrameRgn(impl_->handle->context, region, brush, 1, 1);
::DeleteObject(region);
::DeleteObject(brush);
}
if (impl_->changed == false) impl_->changed = true;