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

Merge branch 'hotfix-1.4' into develop

Browse Source
This commit is contained in:
Jinhao 2016-08-17 23:49:43 +08:00
commit daccf87912
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/gui/place.cpp
View File

@ -15,6 +15,7 @@
#include <cmath>
#include <map>
#include <deque>
#include <algorithm>
#include <nana/push_ignore_diagnostic>
#include <nana/deploy.hpp>
#include <nana/gui/place.hpp>
@ -817,7 +818,7 @@ namespace nana
if ((!child->is_fixed()) && child->max_px.empty() && is_back(child) && (endpos != area.right()))
endpos = area.right();
child_area.w_ref() = static_cast<unsigned>(endpos - child_area.x());
child_area.w_ref() = static_cast<unsigned>((std::max)(endpos - child_area.x(), 0));
child->field_area = child_area.result();
position += child_px;