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

adjust inputbox element width for good looking

Browse Source
This commit is contained in:
Jinhao 2017-07-25 06:41:32 +08:00
parent 33c9def027
commit d5c01b3dd1
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/gui/msgbox.cpp
View File

@ -1288,6 +1288,8 @@ namespace nana
std::vector<unsigned> each_pixels; std::vector<unsigned> each_pixels;
unsigned label_px = 0, fixed_px = 0; unsigned label_px = 0, fixed_px = 0;
paint::graphics graph({ 5, 5 }); paint::graphics graph({ 5, 5 });
bool has_0_fixed_px = false;
for (auto p : contents) for (auto p : contents)
{ {
auto px = label::measure(graph, p->label(), 150, true, align::right, align_v::center); auto px = label::measure(graph, p->label(), 150, true, align::right, align_v::center);
@ -1295,13 +1297,15 @@ namespace nana
label_px = px.width; label_px = px.width;
px.width = p->fixed_pixels(); px.width = p->fixed_pixels();
has_0_fixed_px |= (px.width == 0);
if (px.width > fixed_px) if (px.width > fixed_px)
fixed_px = px.width; fixed_px = px.width;
each_pixels.push_back(px.height); each_pixels.push_back(px.height);
} }
if (fixed_px < 100) //Adjust the fixed_px for good looking
if (has_0_fixed_px && (fixed_px < 100))
fixed_px = 100; fixed_px = 100;
inputbox_window input_wd(owner_, images_, valid_areas_, description_, title_, contents.size(), label_px + 10 + fixed_px, each_pixels); inputbox_window input_wd(owner_, images_, valid_areas_, description_, title_, contents.size(), label_px + 10 + fixed_px, each_pixels);