summaryrefslogtreecommitdiff
path: root/src/gui/base/basiccontainer.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-02-24 14:01:32 +0300
committerAndrei Karas <akaras@inbox.ru>2014-02-24 21:18:57 +0300
commit0a8b5d325f2d2c326b6da27399711b198417a499 (patch)
tree9e89aa7610f3f74ef9df53f6afce6655fc95ab07 /src/gui/base/basiccontainer.cpp
parent779b65f15d3350b2d95a095e24a90526c64dcecb (diff)
downloadmanaverse-0a8b5d325f2d2c326b6da27399711b198417a499.tar.gz
manaverse-0a8b5d325f2d2c326b6da27399711b198417a499.tar.bz2
manaverse-0a8b5d325f2d2c326b6da27399711b198417a499.tar.xz
manaverse-0a8b5d325f2d2c326b6da27399711b198417a499.zip
Rename Rectangle into Rect.
Rename ClipRectangle into ClipRect.
Diffstat (limited to 'src/gui/base/basiccontainer.cpp')
-rw-r--r--src/gui/base/basiccontainer.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/gui/base/basiccontainer.cpp b/src/gui/base/basiccontainer.cpp
index 9f2806016..e854e15ff 100644
--- a/src/gui/base/basiccontainer.cpp
+++ b/src/gui/base/basiccontainer.cpp
@@ -117,9 +117,9 @@ namespace gcn
mWidgets.erase(iter);
}
- Rectangle BasicContainer::getChildrenArea()
+ Rect BasicContainer::getChildrenArea()
{
- return Rectangle(0, 0, getWidth(), getHeight());
+ return Rect(0, 0, getWidth(), getHeight());
}
void BasicContainer::focusNext()
@@ -184,7 +184,7 @@ namespace gcn
Widget *BasicContainer::getWidgetAt(int x, int y)
{
- const Rectangle r = getChildrenArea();
+ const Rect r = getChildrenArea();
if (!r.isPointInRect(x, y))
return nullptr;
@@ -284,7 +284,7 @@ namespace gcn
// draw it before drawing the widget
if (widget->getFrameSize() > 0)
{
- Rectangle rec = widget->getDimension();
+ Rect rec = widget->getDimension();
const int frame = widget->getFrameSize();
const int frame2 = frame * 2;
rec.x -= frame;
@@ -321,9 +321,9 @@ namespace gcn
BLOCK_END("BasicContainer::logicChildren")
}
- void BasicContainer::showWidgetPart(Widget* widget, Rectangle area)
+ void BasicContainer::showWidgetPart(Widget* widget, Rect area)
{
- const Rectangle widgetArea = getChildrenArea();
+ const Rect widgetArea = getChildrenArea();
area.x += widget->getX();
area.y += widget->getY();