X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgeometry.cpp;h=8163022ccdc981220280c938864427afb66c4630;hb=ae991f3bbd83fa0afff5e1fc31be50e1f2d17875;hp=584a1aac55d934185e7bc68e793329a11d935a68;hpb=a9d04a73afcdf40c33d889090d303117b7fd3a7d;p=libs%2Fgltk.git diff --git a/source/geometry.cpp b/source/geometry.cpp index 584a1aa..8163022 100644 --- a/source/geometry.cpp +++ b/source/geometry.cpp @@ -43,33 +43,33 @@ void Alignment::apply(Geometry &geom, const Geometry &parent) const { if(parent.w>geom.w) { - geom.w+=static_cast((parent.w-geom.w)*w); - geom.x+=static_cast((parent.w-geom.w)*x); + geom.w += static_cast((parent.w-geom.w)*w); + geom.x += static_cast((parent.w-geom.w)*x); } if(parent.h>geom.h) { - geom.h+=static_cast((parent.h-geom.h)*h); - geom.y+=static_cast((parent.h-geom.h)*y); + geom.h += static_cast((parent.h-geom.h)*h); + geom.y += static_cast((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; + unsigned pw = parent.w-margin.left-margin.right; + unsigned ph = parent.h-margin.bottom-margin.top; - geom.x+=margin.left; - geom.y+=margin.bottom; + geom.x += margin.left; + geom.y += margin.bottom; - if(parent.w>geom.w) + if(pw>geom.w) { - geom.w+=static_cast((pw-geom.w)*w); - geom.x+=static_cast((pw-geom.w)*x); + geom.w += static_cast((pw-geom.w)*w); + geom.x += static_cast((pw-geom.w)*x); } - if(parent.h>geom.h) + if(ph>geom.h) { - geom.h+=static_cast((ph-geom.h)*h); - geom.y+=static_cast((ph-geom.h)*y); + geom.h += static_cast((ph-geom.h)*h); + geom.y += static_cast((ph-geom.h)*y); } }