diff options
Diffstat (limited to 'libwinnie/src/geom.cc')
-rw-r--r-- | libwinnie/src/geom.cc | 53 |
1 files changed, 27 insertions, 26 deletions
diff --git a/libwinnie/src/geom.cc b/libwinnie/src/geom.cc index 53181db..ff03d42 100644 --- a/libwinnie/src/geom.cc +++ b/libwinnie/src/geom.cc @@ -21,47 +21,48 @@ Author: Eleni Maria Stea <elene.mst@gmail.com> #include "geom.h" -Rect::Rect() -{ - x = y = width = height = 0; -} +Rect::Rect() { x = y = width = height = 0; } Rect::Rect(int x, int y, int w, int h) { - this->x = x; - this->y = y; - width = w; - height = h; + this->x = x; + this->y = y; + width = w; + height = h; } -static inline int min(int x, int y) +static inline int +min(int x, int y) { - return x < y ? x : y; + return x < y ? x : y; } -static inline int max(int x, int y) +static inline int +max(int x, int y) { - return x > y ? x : y; + return x > y ? x : y; } -Rect rect_union(const Rect &a, const Rect &b) +Rect +rect_union(const Rect &a, const Rect &b) { - Rect uni; - uni.x = min(a.x, b.x); - uni.y = min(a.y, b.y); - uni.width = max(a.x + a.width, b.x + b.width) - uni.x; - uni.height = max(a.y + a.height, b.y + b.height) - uni.y; + Rect uni; + uni.x = min(a.x, b.x); + uni.y = min(a.y, b.y); + uni.width = max(a.x + a.width, b.x + b.width) - uni.x; + uni.height = max(a.y + a.height, b.y + b.height) - uni.y; - return uni; + return uni; } -Rect rect_intersection(const Rect &a, const Rect &b) +Rect +rect_intersection(const Rect &a, const Rect &b) { - Rect intersect; - intersect.x = max(a.x, b.x); - intersect.y = max(a.y, b.y); - intersect.width = max(min(a.x + a.width, b.x + b.width) - intersect.x, 0); - intersect.height = max(min(a.y + a.height, b.y + b.height) - intersect.y, 0); + Rect intersect; + intersect.x = max(a.x, b.x); + intersect.y = max(a.y, b.y); + intersect.width = max(min(a.x + a.width, b.x + b.width) - intersect.x, 0); + intersect.height = max(min(a.y + a.height, b.y + b.height) - intersect.y, 0); - return intersect; + return intersect; } |