gesche
/
tibia-client
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix indentation

This commit is contained in:
conde2 2013-11-30 23:34:21 -02:00
parent ca2fe9cf45
commit 7ff73d1064
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/framework/util/rect.h
View File

@ -222,9 +222,9 @@ public:
TRect<T> united(const TRect<T> &r) const {
TRect<T> tmp;
tmp.x1 = std::min<T>(x1, r.x1);
tmp.x2 = std::max<T>(x2, r.x2);
tmp.y1 = std::min<T>(y1, r.y1);
tmp.y2 = std::max<T>(y2, r.y2);
tmp.x2 = std::max<T>(x2, r.x2);
tmp.y1 = std::min<T>(y1, r.y1);
tmp.y2 = std::max<T>(y2, r.y2);
return tmp;
}

4
src/framework/util/size.h
View File

@ -70,8 +70,8 @@ public:
bool operator==(const TSize<T>& other) const { return other.wd==wd && other.ht==ht; }
bool operator!=(const TSize<T>& other) const { return other.wd!=wd || other.ht!=ht; }
TSize<T> expandedTo(const TSize<T>& other) const { return TSize<T>(std::max<T>(wd, other.wd), std::max<T>(ht, other.ht)); }
TSize<T> boundedTo(const TSize<T>& other) const { return TSize<T>(std::min<T>(wd, other.wd), std::min<T>(ht, other.ht)); }
TSize<T> expandedTo(const TSize<T>& other) const { return TSize<T>(std::max<T>(wd, other.wd), std::max<T>(ht, other.ht)); }
TSize<T> boundedTo(const TSize<T>& other) const { return TSize<T>(std::min<T>(wd, other.wd), std::min<T>(ht, other.ht)); }
void scale(const TSize<T>& s, Fw::AspectRatioMode mode) {
if(mode == Fw::IgnoreAspectRatio || wd == 0 || ht == 0) {