Digitalstack/otclient
2
0
Fork 0
mirror of https://github.com/edubart/otclient.git synced 2025-10-17 13:03:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

walk changes, nothing special

Browse Source
This commit is contained in:
Henrique
2011-11-06 02:12:13 -02:00
parent 4208e40c76
commit 7db6b8b5e6
3 changed files with 19 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/framework/ui/uiwindow.cpp
View File

@@ -96,14 +96,7 @@ void UIWindow::onGeometryUpdate(const Rect& oldRect, const Rect& newRect)
UIWidgetPtr parent = getParent();
if(parent) {
Rect parentRect = parent->getRect();
if(boundRect.left() < parentRect.left())
boundRect.moveLeft(parentRect.left());
if(boundRect.top() < parentRect.top())
boundRect.moveTop(parentRect.top());
if(boundRect.bottom() > parentRect.bottom())
boundRect.moveBottom(parentRect.bottom());
if(boundRect.right() > parentRect.right())
boundRect.moveRight(parentRect.right());
boundRect.bound(parentRect);
}
if(boundRect != newRect)

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

@@ -251,6 +251,20 @@ public:
return tmp;
}
void bound(const TRect<T> &r) {
if(isNull() || r.isNull())
return;
if(left() < r.left())
moveLeft(r.left());
if(top() < r.top())
moveTop(r.top());
if(bottom() > r.bottom())
moveBottom(r.bottom());
if(right() > r.right())
moveRight(r.right());
}
TRect<T>& operator=(const TRect<T>& other) { x1 = other.x1; y1 = other.y1; x2 = other.x2; y2 = other.y2; return *this; }
bool operator==(const TRect<T>& other) const { return (x1 == other.x1 && y1 == other.y1 && x2 == other.x2 && y2 == other.y2); }
bool operator!=(const TRect<T>& other) const { return (x1 != other.x1 || y1 != other.y1 || x2 != other.x2 || y2 != other.y2); }