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

Merge branch 'progressbar_with_stop' into hotfixes-1.0.2

Browse Source
This commit is contained in:
qPCR4vir 2015-05-29 15:39:21 +02:00
commit 4a34b87e5b
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/gui/detail/window_layout.cpp
View File

@ -24,6 +24,9 @@ namespace nana
//class window_layout //class window_layout
void window_layout::paint(core_window_t* wd, bool is_redraw, bool is_child_refreshed) void window_layout::paint(core_window_t* wd, bool is_redraw, bool is_child_refreshed)
{ {
if (wd->drawer.graphics.empty())
return;
if (nullptr == wd->effect.bground) if (nullptr == wd->effect.bground)
{ {
if (is_redraw) if (is_redraw)

3
source/paint/detail/native_paint_interface.cpp
View File

@ -156,6 +156,9 @@ namespace detail
nana::size text_extent_size(drawable_type dw, const nana::char_t * text, std::size_t len) nana::size text_extent_size(drawable_type dw, const nana::char_t * text, std::size_t len)
{ {
if (nullptr == dw || nullptr == text || 0 == len)
return{};
nana::size extents = raw_text_extent_size(dw, text, len); nana::size extents = raw_text_extent_size(dw, text, len);
const nana::char_t* const end = text + len; const nana::char_t* const end = text + len;