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

FIX: ? impossible to construct a picture widget

Browse Source
This commit is contained in:
qPCR4vir 2015-08-06 19:33:33 +02:00
parent ae3c9f6357
commit d7aa311fab
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source/gui/widgets/picture.cpp
View File

@ -143,7 +143,8 @@ namespace nana
_m_draw_background(valid_area.width, valid_area.height); _m_draw_background(valid_area.width, valid_area.height);
backimg.image.paste(valid_area, graph, pos); if ( ! backimg.image.empty())
backimg.image.paste(valid_area, graph, pos);
} }
} }
else else
@ -163,7 +164,7 @@ namespace nana
if (graph && (bground_mode::basic != API::effects_bground_mode(*impl_->wdg_ptr))) if (graph && (bground_mode::basic != API::effects_bground_mode(*impl_->wdg_ptr)))
{ {
if (w < graph->size().width || h < graph->size().width || impl_->backimg.image.alpha()) if (w < graph->size().width || h < graph->size().height /* .width ??? */ || impl_->backimg.image.alpha())
{ {
auto & bground = impl_->gradual_bground; auto & bground = impl_->gradual_bground;
if (bground.gradual_from.invisible() || bground.gradual_to.invisible()) if (bground.gradual_from.invisible() || bground.gradual_to.invisible())