void Alignment::apply(Geometry &geom, const Geometry &parent) const
{
if(parent.w>geom.w)
- geom.w+=static_cast<unsigned>((parent.w-geom.w)*w);
+ {
+ geom.w += static_cast<unsigned>((parent.w-geom.w)*w);
+ geom.x += static_cast<int>((parent.w-geom.w)*x);
+ }
if(parent.h>geom.h)
- geom.h+=static_cast<unsigned>((parent.h-geom.h)*h);
-
- geom.x+=static_cast<int>((parent.w-geom.w)*x);
- geom.y+=static_cast<int>((parent.h-geom.h)*y);
+ {
+ geom.h += static_cast<unsigned>((parent.h-geom.h)*h);
+ geom.y += static_cast<int>((parent.h-geom.h)*y);
+ }
}
void Alignment::apply(Geometry &geom, const Geometry &parent, const Sides &margin) const
{
- unsigned pw=parent.w-margin.left-margin.right;
- unsigned ph=parent.h-margin.bottom-margin.top;
-
- if(parent.w>geom.w)
- geom.w+=static_cast<unsigned>((pw-geom.w)*w);
- if(parent.h>geom.h)
- geom.h+=static_cast<unsigned>((ph-geom.h)*h);
-
- geom.x+=static_cast<int>(margin.left+(pw-geom.w)*x);
- geom.y+=static_cast<int>(margin.bottom+(ph-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);
+ }
}
} // namespace GLtk