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

Merge branch 'hotfix-1.2.2' into develop

Browse Source
This commit is contained in:
Jinhao 2016-01-31 22:07:08 +08:00
commit 780805484e
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
source/gui/widgets/menu.cpp
View File

@ -145,7 +145,14 @@ namespace nana
void item_image(graph_reference graph, const nana::point& pos, unsigned image_px, const paint::image& img) void item_image(graph_reference graph, const nana::point& pos, unsigned image_px, const paint::image& img)
{ {
img.stretch(rectangle{ img.size() }, graph, rectangle{ pos, ::nana::size(image_px, image_px) }); if (img.size().width > image_px || img.size().height > image_px )
img.stretch(rectangle{ img.size() }, graph, rectangle{ pos, ::nana::size(image_px, image_px) });
else {
nana::point ipos = pos;
ipos.x += (image_px - img.size().width ) / 2;
ipos.y += (image_px - img.size().height) / 2;
img.paste(graph, ipos);
}
} }
void item_text(graph_reference graph, const nana::point& pos, const std::string& text, unsigned text_pixels, const attr& at) void item_text(graph_reference graph, const nana::point& pos, const std::string& text, unsigned text_pixels, const attr& at)