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

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Jinhao 2015-08-08 07:07:44 +08:00
commit 1600d73856
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/nana/gui/widgets/label.hpp
View File

@ -58,6 +58,7 @@ namespace nana
label(); label();
label(window, bool visible); label(window, bool visible);
label(window, const nana::string& text, bool visible = true); label(window, const nana::string& text, bool visible = true);
label(window parent, const nana::char_t* text, bool visible = true) :label(parent, nana::string(text),visible) {};
label(window, const rectangle& = {}, bool visible = true); label(window, const rectangle& = {}, bool visible = true);
label& transparent(bool); ///< Switchs the label widget to the transparent background mode. label& transparent(bool); ///< Switchs the label widget to the transparent background mode.
bool transparent() const throw(); bool transparent() const throw();

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

@ -143,6 +143,7 @@ namespace nana
_m_draw_background(valid_area.width, valid_area.height); _m_draw_background(valid_area.width, valid_area.height);
if ( ! backimg.image.empty())
backimg.image.paste(valid_area, graph, pos); backimg.image.paste(valid_area, graph, pos);
} }
} }
@ -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())