- geom.x+=static_cast<int>(margin.left+(parent.w-margin.left-margin.right-geom.w)*x);
- geom.y+=static_cast<int>(margin.bottom+(parent.h-margin.bottom-margin.top-geom.h)*y);
+ unsigned pw=parent.w-margin.left-margin.right;
+ unsigned ph=parent.h-margin.bottom-margin.top;
+
+ geom.x+=margin.left;
+ geom.y+=margin.bottom;
+
+ if(pw>geom.w)
+ {
+ geom.w+=static_cast<unsigned>((pw-geom.w)*w);
+ geom.x+=static_cast<int>((pw-geom.w)*x);
+ }
+ if(ph>geom.h)
+ {
+ geom.h+=static_cast<unsigned>((ph-geom.h)*h);
+ geom.y+=static_cast<int>((ph-geom.h)*y);
+ }