summaryrefslogtreecommitdiff
path: root/src/gui/widgets
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/widgets
parent779b65f15d3350b2d95a095e24a90526c64dcecb (diff)
downloadmv-0a8b5d325f2d2c326b6da27399711b198417a499.tar.gz
mv-0a8b5d325f2d2c326b6da27399711b198417a499.tar.bz2
mv-0a8b5d325f2d2c326b6da27399711b198417a499.tar.xz
mv-0a8b5d325f2d2c326b6da27399711b198417a499.zip
Rename Rectangle into Rect.
Rename ClipRectangle into ClipRect.
Diffstat (limited to 'src/gui/widgets')
-rw-r--r--src/gui/widgets/avatarlistbox.cpp4
-rw-r--r--src/gui/widgets/browserbox.cpp8
-rw-r--r--src/gui/widgets/button.cpp6
-rw-r--r--src/gui/widgets/colorpage.cpp2
-rw-r--r--src/gui/widgets/desktop.cpp10
-rw-r--r--src/gui/widgets/dropdown.cpp10
-rw-r--r--src/gui/widgets/dropdown.h2
-rw-r--r--src/gui/widgets/extendedlistbox.cpp2
-rw-r--r--src/gui/widgets/guitable.cpp16
-rw-r--r--src/gui/widgets/guitable.h2
-rw-r--r--src/gui/widgets/label.cpp2
-rw-r--r--src/gui/widgets/layout.cpp2
-rw-r--r--src/gui/widgets/layouthelper.cpp2
-rw-r--r--src/gui/widgets/listbox.cpp4
-rw-r--r--src/gui/widgets/popup.cpp4
-rw-r--r--src/gui/widgets/popup.h2
-rw-r--r--src/gui/widgets/progressbar.cpp2
-rw-r--r--src/gui/widgets/scrollarea.cpp82
-rw-r--r--src/gui/widgets/scrollarea.h16
-rw-r--r--src/gui/widgets/shoplistbox.cpp2
-rw-r--r--src/gui/widgets/shortcutcontainer.cpp2
-rw-r--r--src/gui/widgets/spellshortcutcontainer.cpp2
-rw-r--r--src/gui/widgets/tabbedarea.cpp4
-rw-r--r--src/gui/widgets/tabbedarea.h2
-rw-r--r--src/gui/widgets/tabs/chattab.cpp2
-rw-r--r--src/gui/widgets/tabs/setup_audio.cpp2
-rw-r--r--src/gui/widgets/tabs/setup_chat.cpp2
-rw-r--r--src/gui/widgets/tabs/setup_colors.cpp2
-rw-r--r--src/gui/widgets/tabs/setup_input.cpp2
-rw-r--r--src/gui/widgets/tabs/setup_joystick.cpp2
-rw-r--r--src/gui/widgets/tabs/setup_mods.cpp2
-rw-r--r--src/gui/widgets/tabs/setup_other.cpp2
-rw-r--r--src/gui/widgets/tabs/setup_perfomance.cpp2
-rw-r--r--src/gui/widgets/tabs/setup_players.cpp2
-rw-r--r--src/gui/widgets/tabs/setup_relations.cpp2
-rw-r--r--src/gui/widgets/tabs/setup_theme.cpp2
-rw-r--r--src/gui/widgets/tabs/setup_touch.cpp2
-rw-r--r--src/gui/widgets/tabs/setup_video.cpp2
-rw-r--r--src/gui/widgets/tabs/setup_visual.cpp2
-rw-r--r--src/gui/widgets/textbox.cpp2
-rw-r--r--src/gui/widgets/textfield.cpp2
-rw-r--r--src/gui/widgets/textpreview.cpp4
-rw-r--r--src/gui/widgets/widget.cpp26
-rw-r--r--src/gui/widgets/widget.h14
-rw-r--r--src/gui/widgets/window.cpp14
-rw-r--r--src/gui/widgets/window.h10
46 files changed, 147 insertions, 145 deletions
diff --git a/src/gui/widgets/avatarlistbox.cpp b/src/gui/widgets/avatarlistbox.cpp
index 46a78d99e..01126f8ac 100644
--- a/src/gui/widgets/avatarlistbox.cpp
+++ b/src/gui/widgets/avatarlistbox.cpp
@@ -162,7 +162,7 @@ void AvatarListBox::draw(Graphics *graphics)
color.a = 80;
graphics->setColor(color);
- graphics->fillRectangle(Rectangle(mPadding, y + mPadding,
+ graphics->fillRectangle(Rect(mPadding, y + mPadding,
parent->getWidth() * a->getHp() / a->getMaxHp()
- 2 * mPadding, fontHeight));
}
@@ -186,7 +186,7 @@ void AvatarListBox::draw(Graphics *graphics)
color.a = 80;
graphics->setColor(color);
- graphics->fillRectangle(Rectangle(mPadding, y + mPadding,
+ graphics->fillRectangle(Rect(mPadding, y + mPadding,
parent->getWidth() * a->getDamageHp() / 1024
- 2 * mPadding, fontHeight));
diff --git a/src/gui/widgets/browserbox.cpp b/src/gui/widgets/browserbox.cpp
index c36a607f4..100281d94 100644
--- a/src/gui/widgets/browserbox.cpp
+++ b/src/gui/widgets/browserbox.cpp
@@ -37,7 +37,7 @@
#include "utils/stringutils.h"
#include "utils/timer.h"
-#include "gui/cliprectangle.h"
+#include "gui/cliprect.h"
#include "render/graphics.h"
@@ -448,7 +448,7 @@ void BrowserBox::mouseMoved(MouseEvent &event)
void BrowserBox::draw(Graphics *graphics)
{
BLOCK_START("BrowserBox::draw")
- const ClipRectangle *const cr = graphics->getCurrentClipArea();
+ const ClipRect *const cr = graphics->getCurrentClipArea();
if (!cr)
return;
mYStart = cr->y - cr->yOffset;
@@ -462,7 +462,7 @@ void BrowserBox::draw(Graphics *graphics)
if (mOpaque)
{
graphics->setColor(mBackgroundColor);
- graphics->fillRectangle(Rectangle(0, 0, getWidth(), getHeight()));
+ graphics->fillRectangle(Rect(0, 0, getWidth(), getHeight()));
}
if (mSelectedLink >= 0 && mSelectedLink
@@ -471,7 +471,7 @@ void BrowserBox::draw(Graphics *graphics)
if ((mHighMode & BACKGROUND))
{
graphics->setColor(mHighlightColor);
- graphics->fillRectangle(Rectangle(
+ graphics->fillRectangle(Rect(
mLinks[mSelectedLink].x1,
mLinks[mSelectedLink].y1,
mLinks[mSelectedLink].x2 - mLinks[mSelectedLink].x1,
diff --git a/src/gui/widgets/button.cpp b/src/gui/widgets/button.cpp
index 2642a67a3..3cb6d823d 100644
--- a/src/gui/widgets/button.cpp
+++ b/src/gui/widgets/button.cpp
@@ -35,6 +35,8 @@
#include "gui/font.h"
#include "gui/gui.h"
+#include "gui/rect.h"
+
#include "debug.h"
int Button::mInstances = 0;
@@ -380,7 +382,7 @@ void Button::draw(Graphics *graphics)
{
// because we don't know where parent windows was moved,
// need recalc vertexes
- ClipRectangle &rect = graphics->getTopClip();
+ ClipRect &rect = graphics->getTopClip();
if (rect.xOffset != mXOffset || rect.yOffset != mYOffset)
{
recalc = true;
@@ -420,7 +422,7 @@ void Button::draw(Graphics *graphics)
int imageX = 0;
int imageY = 0;
int textX = 0;
- const Rectangle &rect = mDimension;
+ const Rect &rect = mDimension;
const int width = rect.width;
const int height = rect.height;
Font *const font = getFont();
diff --git a/src/gui/widgets/colorpage.cpp b/src/gui/widgets/colorpage.cpp
index 5e10b885c..501b3dea7 100644
--- a/src/gui/widgets/colorpage.cpp
+++ b/src/gui/widgets/colorpage.cpp
@@ -64,7 +64,7 @@ void ColorPage::draw(Graphics *graphics)
if (mSelected >= 0)
{
- graphics->fillRectangle(Rectangle(mPadding,
+ graphics->fillRectangle(Rect(mPadding,
rowHeight * mSelected + mPadding,
mDimension.width - 2 * mPadding, rowHeight));
diff --git a/src/gui/widgets/desktop.cpp b/src/gui/widgets/desktop.cpp
index 5dca7578c..a77516c62 100644
--- a/src/gui/widgets/desktop.cpp
+++ b/src/gui/widgets/desktop.cpp
@@ -107,7 +107,7 @@ void Desktop::draw(Graphics *graphics)
{
BLOCK_START("Desktop::draw")
- const Rectangle &rect = mDimension;
+ const Rect &rect = mDimension;
const int width = rect.width;
const int height = rect.height;
if (mWallpaper)
@@ -118,7 +118,7 @@ void Desktop::draw(Graphics *graphics)
if (width > wallpWidth || height > wallpHeight)
{
graphics->setColor(mBackgroundGrayColor);
- graphics->fillRectangle(Rectangle(0, 0, width, height));
+ graphics->fillRectangle(Rect(0, 0, width, height));
}
if (imageHelper->useOpenGL() == RENDER_SOFTWARE)
@@ -135,12 +135,12 @@ void Desktop::draw(Graphics *graphics)
else
{
graphics->setColor(mBackgroundGrayColor);
- graphics->fillRectangle(Rectangle(0, 0, width, height));
+ graphics->fillRectangle(Rect(0, 0, width, height));
}
// Draw a thin border under the application version...
graphics->setColor(mBackgroundColor);
- graphics->fillRectangle(Rectangle(mVersionLabel->getDimension()));
+ graphics->fillRectangle(Rect(mVersionLabel->getDimension()));
Container::draw(graphics);
BLOCK_END("Desktop::draw")
@@ -165,7 +165,7 @@ void Desktop::setBestFittingWallpaper()
mWallpaper = nullptr;
}
- const Rectangle &rect = mDimension;
+ const Rect &rect = mDimension;
const int width = rect.width;
const int height = rect.height;
diff --git a/src/gui/widgets/dropdown.cpp b/src/gui/widgets/dropdown.cpp
index 982b2cf0d..dfc17e17b 100644
--- a/src/gui/widgets/dropdown.cpp
+++ b/src/gui/widgets/dropdown.cpp
@@ -268,7 +268,7 @@ void DropDown::draw(Graphics* graphics)
if (isFocused())
{
graphics->setColor(mHighlightColor);
- graphics->drawRectangle(Rectangle(mPadding, mPadding,
+ graphics->drawRectangle(Rect(mPadding, mPadding,
mDimension.width - h - pad, h - pad));
}
@@ -291,7 +291,7 @@ void DropDown::drawFrame(Graphics *graphics)
{
BLOCK_START("DropDown::drawFrame")
const int bs2 = getFrameSize();
- const Rectangle &rect = mDimension;
+ const Rect &rect = mDimension;
graphics->drawImageRect(0, 0,
rect.width + bs2, rect.height + bs2,
skinRect);
@@ -513,16 +513,16 @@ void DropDown::action(const ActionEvent &actionEvent A_UNUSED)
distributeActionEvent();
}
-Rectangle DropDown::getChildrenArea()
+Rect DropDown::getChildrenArea()
{
if (mDroppedDown)
{
// Calculate the children area (with the one pixel border in mind)
- return Rectangle(1, mFoldedUpHeight + 1,
+ return Rect(1, mFoldedUpHeight + 1,
mDimension.width - 2, mDimension.height - mFoldedUpHeight - 2);
}
- return Rectangle();
+ return Rect();
}
void DropDown::valueChanged(const SelectionEvent& event A_UNUSED)
diff --git a/src/gui/widgets/dropdown.h b/src/gui/widgets/dropdown.h
index b8c3e7150..8e463a2c1 100644
--- a/src/gui/widgets/dropdown.h
+++ b/src/gui/widgets/dropdown.h
@@ -125,7 +125,7 @@ class DropDown final : public ActionListener,
void removeSelectionListener(SelectionListener* selectionListener);
- Rectangle getChildrenArea() override;
+ Rect getChildrenArea() override;
void action(const ActionEvent &actionEvent) override;
diff --git a/src/gui/widgets/extendedlistbox.cpp b/src/gui/widgets/extendedlistbox.cpp
index 15a52ee82..7245ddd19 100644
--- a/src/gui/widgets/extendedlistbox.cpp
+++ b/src/gui/widgets/extendedlistbox.cpp
@@ -134,7 +134,7 @@ void ExtendedListBox::draw(Graphics *graphics)
{
mHighlightColor.a = static_cast<int>(mAlpha * 255.0F);
graphics->setColor(mHighlightColor);
- graphics->fillRectangle(Rectangle(mPadding, minY + mPadding,
+ graphics->fillRectangle(Rect(mPadding, minY + mPadding,
width - pad2, maxY - minY + height));
}
diff --git a/src/gui/widgets/guitable.cpp b/src/gui/widgets/guitable.cpp
index 98e7e5f23..70ebb77d6 100644
--- a/src/gui/widgets/guitable.cpp
+++ b/src/gui/widgets/guitable.cpp
@@ -304,7 +304,7 @@ void GuiTable::draw(Graphics* graphics)
if (client->getGuiAlpha() != mAlpha)
mAlpha = client->getGuiAlpha();
- const Rectangle &rect = mDimension;
+ const Rect &rect = mDimension;
const int width = rect.width;
const int height = rect.height;
const int y = rect.y;
@@ -312,7 +312,7 @@ void GuiTable::draw(Graphics* graphics)
{
mBackgroundColor.a = static_cast<int>(mAlpha * 255.0F);
graphics->setColor(mBackgroundColor);
- graphics->fillRectangle(Rectangle(0, 0, width, height));
+ graphics->fillRectangle(Rect(0, 0, width, height));
}
// First, determine how many rows we need to draw,
@@ -351,7 +351,7 @@ void GuiTable::draw(Graphics* graphics)
const int cWidth = getColumnWidth(c);
if (widget)
{
- Rectangle bounds(x_offset, y_offset, cWidth, rHeight);
+ Rect bounds(x_offset, y_offset, cWidth, rHeight);
if (widget == mTopWidget)
{
@@ -369,14 +369,14 @@ void GuiTable::draw(Graphics* graphics)
if (mLinewiseMode && r == static_cast<unsigned>(
mSelectedRow) && c == 0)
{
- graphics->fillRectangle(Rectangle(0, y_offset,
+ graphics->fillRectangle(Rect(0, y_offset,
width, rHeight));
}
else if (!mLinewiseMode && mSelectedColumn > 0
&& c == static_cast<unsigned>(mSelectedColumn)
&& r == static_cast<unsigned>(mSelectedRow))
{
- graphics->fillRectangle(Rectangle(
+ graphics->fillRectangle(Rect(
x_offset, y_offset, cWidth, rHeight));
}
}
@@ -393,7 +393,7 @@ void GuiTable::draw(Graphics* graphics)
if (mTopWidget)
{
- const Rectangle &bounds = mTopWidget->getDimension();
+ const Rect &bounds = mTopWidget->getDimension();
graphics->pushClipArea(bounds);
mTopWidget->draw(graphics);
graphics->popClipArea();
@@ -414,9 +414,9 @@ void GuiTable::moveToBottom(Widget *widget)
mTopWidget = nullptr;
}
-Rectangle GuiTable::getChildrenArea()
+Rect GuiTable::getChildrenArea()
{
- return Rectangle(0, 0, mDimension.width, mDimension.height);
+ return Rect(0, 0, mDimension.width, mDimension.height);
}
// -- KeyListener notifications
diff --git a/src/gui/widgets/guitable.h b/src/gui/widgets/guitable.h
index 8f5d0d300..fb0c34784 100644
--- a/src/gui/widgets/guitable.h
+++ b/src/gui/widgets/guitable.h
@@ -93,7 +93,7 @@ public:
void setWrappingEnabled(bool wrappingEnabled)
{ mWrappingEnabled = wrappingEnabled; }
- Rectangle getChildrenArea() override final A_WARN_UNUSED;
+ Rect getChildrenArea() override final A_WARN_UNUSED;
/**
* Toggle whether to use linewise selection mode, in which the table selects
diff --git a/src/gui/widgets/label.cpp b/src/gui/widgets/label.cpp
index 5b1804667..56c949964 100644
--- a/src/gui/widgets/label.cpp
+++ b/src/gui/widgets/label.cpp
@@ -80,7 +80,7 @@ void Label::draw(Graphics* graphics)
{
BLOCK_START("Label::draw")
int textX;
- const Rectangle &rect = mDimension;
+ const Rect &rect = mDimension;
const int textY = rect.height / 2 - getFont()->getHeight() / 2;
Font *const font = getFont();
diff --git a/src/gui/widgets/layout.cpp b/src/gui/widgets/layout.cpp
index 2af27a21c..24722510b 100644
--- a/src/gui/widgets/layout.cpp
+++ b/src/gui/widgets/layout.cpp
@@ -80,7 +80,7 @@ void LayoutCell::reflow(int nx, int ny, int nw, int nh)
if (mType == ARRAY)
mArray->reflow(nx, ny, nw, nh);
else
- mWidget->setDimension(Rectangle(nx, ny, nw, nh));
+ mWidget->setDimension(Rect(nx, ny, nw, nh));
}
void LayoutCell::computeSizes()
diff --git a/src/gui/widgets/layouthelper.cpp b/src/gui/widgets/layouthelper.cpp
index 83e6d050a..c225c7543 100644
--- a/src/gui/widgets/layouthelper.cpp
+++ b/src/gui/widgets/layouthelper.cpp
@@ -65,7 +65,7 @@ void LayoutHelper::reflowLayout(int w, int h)
void LayoutHelper::widgetResized(const Event &event A_UNUSED)
{
- const Rectangle area = mContainer->getChildrenArea();
+ const Rect area = mContainer->getChildrenArea();
int w = area.width;
int h = area.height;
mLayout.reflow(w, h);
diff --git a/src/gui/widgets/listbox.cpp b/src/gui/widgets/listbox.cpp
index 949c52455..c6e431634 100644
--- a/src/gui/widgets/listbox.cpp
+++ b/src/gui/widgets/listbox.cpp
@@ -118,7 +118,7 @@ void ListBox::draw(Graphics *graphics)
// Draw filled rectangle around the selected list element
if (mSelected >= 0)
{
- graphics->fillRectangle(Rectangle(mPadding,
+ graphics->fillRectangle(Rect(mPadding,
rowHeight * mSelected + mPadding,
mDimension.width - 2 * mPadding, rowHeight));
@@ -148,7 +148,7 @@ void ListBox::draw(Graphics *graphics)
// Draw filled rectangle around the selected list element
if (mSelected >= 0)
{
- graphics->fillRectangle(Rectangle(mPadding,
+ graphics->fillRectangle(Rect(mPadding,
rowHeight * mSelected + mPadding,
mDimension.width - 2 * mPadding, rowHeight));
diff --git a/src/gui/widgets/popup.cpp b/src/gui/widgets/popup.cpp
index 9a0a38013..1114b4a5e 100644
--- a/src/gui/widgets/popup.cpp
+++ b/src/gui/widgets/popup.cpp
@@ -122,10 +122,10 @@ void Popup::draw(Graphics *graphics)
BLOCK_END("Popup::draw")
}
-Rectangle Popup::getChildrenArea()
+Rect Popup::getChildrenArea()
{
const int pad2 = mPadding * 2;
- return Rectangle(mPadding, mPadding,
+ return Rect(mPadding, mPadding,
mDimension.width - pad2, mDimension.height - pad2);
}
diff --git a/src/gui/widgets/popup.h b/src/gui/widgets/popup.h
index 3c8947fce..01247cf61 100644
--- a/src/gui/widgets/popup.h
+++ b/src/gui/widgets/popup.h
@@ -152,7 +152,7 @@ class Popup : public Container,
// Inherited from BasicContainer
- virtual Rectangle getChildrenArea() override;
+ virtual Rect getChildrenArea() override;
/**
* Sets the location to display the popup. Tries to horizontally center
diff --git a/src/gui/widgets/progressbar.cpp b/src/gui/widgets/progressbar.cpp
index 1a1b8dc0e..5bccd61ca 100644
--- a/src/gui/widgets/progressbar.cpp
+++ b/src/gui/widgets/progressbar.cpp
@@ -261,7 +261,7 @@ void ProgressBar::render(Graphics *graphics)
{
if (width > maxWidth)
width = maxWidth;
- graphics->fillRectangle(Rectangle(mFillPadding, mFillPadding,
+ graphics->fillRectangle(Rect(mFillPadding, mFillPadding,
width, mDimension.height - pad));
}
}
diff --git a/src/gui/widgets/scrollarea.cpp b/src/gui/widgets/scrollarea.cpp
index f28f45d78..dcc3a871b 100644
--- a/src/gui/widgets/scrollarea.cpp
+++ b/src/gui/widgets/scrollarea.cpp
@@ -318,7 +318,7 @@ void ScrollArea::updateCalcFlag(Graphics *const graphics)
{
// because we don't know where parent windows was moved,
// need recalc vertexes
- const ClipRectangle &rect = graphics->getTopClip();
+ const ClipRect &rect = graphics->getTopClip();
if (rect.xOffset != mXOffset || rect.yOffset != mYOffset)
{
mRedraw = true;
@@ -381,7 +381,7 @@ void ScrollArea::drawButton(Graphics *const graphics,
const BUTTON_DIR dir)
{
int state = 0;
- Rectangle dim;
+ Rect dim;
switch (dir)
{
@@ -416,7 +416,7 @@ void ScrollArea::calcButton(Graphics *const graphics,
const BUTTON_DIR dir)
{
int state = 0;
- Rectangle dim;
+ Rect dim;
switch (dir)
{
@@ -452,7 +452,7 @@ void ScrollArea::calcButton(Graphics *const graphics,
void ScrollArea::drawVBar(Graphics *const graphics)
{
- const Rectangle &dim = getVerticalBarDimension();
+ const Rect &dim = getVerticalBarDimension();
if (vBackground.grid[4])
{
@@ -475,7 +475,7 @@ void ScrollArea::drawVBar(Graphics *const graphics)
void ScrollArea::calcVBar(Graphics *const graphics)
{
- const Rectangle &dim = getVerticalBarDimension();
+ const Rect &dim = getVerticalBarDimension();
if (vBackground.grid[4])
{
@@ -502,7 +502,7 @@ void ScrollArea::calcVBar(Graphics *const graphics)
void ScrollArea::drawHBar(Graphics *const graphics)
{
- const Rectangle &dim = getHorizontalBarDimension();
+ const Rect &dim = getHorizontalBarDimension();
if (hBackground.grid[4])
{
@@ -530,7 +530,7 @@ void ScrollArea::drawHBar(Graphics *const graphics)
void ScrollArea::calcHBar(Graphics *const graphics)
{
- const Rectangle &dim = getHorizontalBarDimension();
+ const Rect &dim = getHorizontalBarDimension();
if (hBackground.grid[4])
{
@@ -561,7 +561,7 @@ void ScrollArea::calcHBar(Graphics *const graphics)
void ScrollArea::drawVMarker(Graphics *const graphics)
{
- const Rectangle &dim = getVerticalMarkerDimension();
+ const Rect &dim = getVerticalMarkerDimension();
if ((mHasMouse) && (mX > (mDimension.width - mScrollbarWidth)))
{
@@ -579,7 +579,7 @@ void ScrollArea::drawVMarker(Graphics *const graphics)
void ScrollArea::calcVMarker(Graphics *const graphics)
{
- const Rectangle &dim = getVerticalMarkerDimension();
+ const Rect &dim = getVerticalMarkerDimension();
if ((mHasMouse) && (mX > (mDimension.width - mScrollbarWidth)))
{
@@ -599,7 +599,7 @@ void ScrollArea::calcVMarker(Graphics *const graphics)
void ScrollArea::drawHMarker(Graphics *const graphics)
{
- const Rectangle dim = getHorizontalMarkerDimension();
+ const Rect dim = getHorizontalMarkerDimension();
if ((mHasMouse) && (mY > (mDimension.height - mScrollbarWidth)))
{
@@ -618,7 +618,7 @@ void ScrollArea::drawHMarker(Graphics *const graphics)
void ScrollArea::calcHMarker(Graphics *const graphics)
{
- const Rectangle dim = getHorizontalMarkerDimension();
+ const Rect dim = getHorizontalMarkerDimension();
if ((mHasMouse) && (mY > (mDimension.height - mScrollbarWidth)))
{
@@ -811,7 +811,7 @@ void ScrollArea::mouseDragged(MouseEvent &event)
{
if (mIsVerticalMarkerDragged)
{
- const Rectangle barDim = getVerticalBarDimension();
+ const Rect barDim = getVerticalBarDimension();
const int pos = event.getY() - barDim.y
- mVerticalMarkerDragOffset;
@@ -830,7 +830,7 @@ void ScrollArea::mouseDragged(MouseEvent &event)
if (mIsHorizontalMarkerDragged)
{
- const Rectangle barDim = getHorizontalBarDimension();
+ const Rect barDim = getHorizontalBarDimension();
const int pos = event.getX() - barDim.x
- mHorizontalMarkerDragOffset;
@@ -851,50 +851,50 @@ void ScrollArea::mouseDragged(MouseEvent &event)
mRedraw = true;
}
-Rectangle ScrollArea::getVerticalBarDimension() const
+Rect ScrollArea::getVerticalBarDimension() const
{
if (!mVBarVisible)
- return Rectangle(0, 0, 0, 0);
+ return Rect(0, 0, 0, 0);
const int height = (mVBarVisible && mShowButtons) ? mScrollbarWidth : 0;
if (mHBarVisible)
{
- return Rectangle(mDimension.width - mScrollbarWidth,
+ return Rect(mDimension.width - mScrollbarWidth,
height,
mScrollbarWidth,
mDimension.height - 2 * height - mScrollbarWidth);
}
- return Rectangle(mDimension.width - mScrollbarWidth,
+ return Rect(mDimension.width - mScrollbarWidth,
height,
mScrollbarWidth,
mDimension.height - 2 * height);
}
-Rectangle ScrollArea::getHorizontalBarDimension() const
+Rect ScrollArea::getHorizontalBarDimension() const
{
if (!mHBarVisible)
- return Rectangle(0, 0, 0, 0);
+ return Rect(0, 0, 0, 0);
const int width = mShowButtons ? mScrollbarWidth : 0;
if (mVBarVisible)
{
- return Rectangle(width,
+ return Rect(width,
mDimension.height - mScrollbarWidth,
mDimension.width - 2 * width - mScrollbarWidth,
mScrollbarWidth);
}
- return Rectangle(width,
+ return Rect(width,
mDimension.height - mScrollbarWidth,
mDimension.width - 2 * width,
mScrollbarWidth);
}
-Rectangle ScrollArea::getVerticalMarkerDimension()
+Rect ScrollArea::getVerticalMarkerDimension()
{
if (!mVBarVisible)
- return Rectangle(0, 0, 0, 0);
+ return Rect(0, 0, 0, 0);
int length, pos;
int height;
@@ -945,14 +945,14 @@ Rectangle ScrollArea::getVerticalMarkerDimension()
pos = 0;
}
- return Rectangle(mDimension.width - mScrollbarWidth, h2 + pos,
+ return Rect(mDimension.width - mScrollbarWidth, h2 + pos,
mScrollbarWidth, length);
}
-Rectangle ScrollArea::getHorizontalMarkerDimension()
+Rect ScrollArea::getHorizontalMarkerDimension()
{
if (!mHBarVisible)
- return Rectangle(0, 0, 0, 0);
+ return Rect(0, 0, 0, 0);
int length, pos;
int width;
@@ -1007,61 +1007,61 @@ Rectangle ScrollArea::getHorizontalMarkerDimension()
}
}
- return Rectangle(w2 + pos, mDimension.height - mScrollbarWidth,
+ return Rect(w2 + pos, mDimension.height - mScrollbarWidth,
length, mScrollbarWidth);
}
-Rectangle ScrollArea::getUpButtonDimension() const
+Rect ScrollArea::getUpButtonDimension() const
{
if (!mVBarVisible || !mShowButtons)
- return Rectangle(0, 0, 0, 0);
+ return Rect(0, 0, 0, 0);
- return Rectangle(mDimension.width - mScrollbarWidth, 0,
+ return Rect(mDimension.width - mScrollbarWidth, 0,
mScrollbarWidth, mScrollbarWidth);
}
-Rectangle ScrollArea::getDownButtonDimension() const
+Rect ScrollArea::getDownButtonDimension() const
{
if (!mVBarVisible || !mShowButtons)
- return Rectangle(0, 0, 0, 0);
+ return Rect(0, 0, 0, 0);
if (mVBarVisible && mHBarVisible)
{
- return Rectangle(mDimension.width - mScrollbarWidth,
+ return Rect(mDimension.width - mScrollbarWidth,
mDimension.height - mScrollbarWidth*2,
mScrollbarWidth,
mScrollbarWidth);
}
- return Rectangle(mDimension.width - mScrollbarWidth,
+ return Rect(mDimension.width - mScrollbarWidth,
mDimension.height - mScrollbarWidth,
mScrollbarWidth,
mScrollbarWidth);
}
-Rectangle ScrollArea::getLeftButtonDimension() const
+Rect ScrollArea::getLeftButtonDimension() const
{
if (!mHBarVisible || !mShowButtons)
- return Rectangle(0, 0, 0, 0);
+ return Rect(0, 0, 0, 0);
- return Rectangle(0, mDimension.height - mScrollbarWidth,
+ return Rect(0, mDimension.height - mScrollbarWidth,
mScrollbarWidth, mScrollbarWidth);
}
-Rectangle ScrollArea::getRightButtonDimension() const
+Rect ScrollArea::getRightButtonDimension() const
{
if (!mHBarVisible || !mShowButtons)
- return Rectangle(0, 0, 0, 0);
+ return Rect(0, 0, 0, 0);
if (mVBarVisible && mHBarVisible)
{
- return Rectangle(mDimension.width - mScrollbarWidth*2,
+ return Rect(mDimension.width - mScrollbarWidth*2,
mDimension.height - mScrollbarWidth,
mScrollbarWidth,
mScrollbarWidth);
}
- return Rectangle(mDimension.width - mScrollbarWidth,
+ return Rect(mDimension.width - mScrollbarWidth,
mDimension.height - mScrollbarWidth,
mScrollbarWidth,
mScrollbarWidth);
diff --git a/src/gui/widgets/scrollarea.h b/src/gui/widgets/scrollarea.h
index a6081e506..7d2b39a96 100644
--- a/src/gui/widgets/scrollarea.h
+++ b/src/gui/widgets/scrollarea.h
@@ -119,21 +119,21 @@ class ScrollArea final : public gcn::ScrollArea,
void widgetMoved(const Event &event) override final;
- Rectangle getVerticalBarDimension() const;
+ Rect getVerticalBarDimension() const;
- Rectangle getHorizontalBarDimension() const;
+ Rect getHorizontalBarDimension() const;
- Rectangle getVerticalMarkerDimension();
+ Rect getVerticalMarkerDimension();
- Rectangle getHorizontalMarkerDimension();
+ Rect getHorizontalMarkerDimension();
- Rectangle getUpButtonDimension() const;
+ Rect getUpButtonDimension() const;
- Rectangle getDownButtonDimension() const;
+ Rect getDownButtonDimension() const;
- Rectangle getLeftButtonDimension() const;
+ Rect getLeftButtonDimension() const;
- Rectangle getRightButtonDimension() const;
+ Rect getRightButtonDimension() const;
protected:
enum BUTTON_DIR
diff --git a/src/gui/widgets/shoplistbox.cpp b/src/gui/widgets/shoplistbox.cpp
index 45d3022c8..007dc6442 100644
--- a/src/gui/widgets/shoplistbox.cpp
+++ b/src/gui/widgets/shoplistbox.cpp
@@ -144,7 +144,7 @@ void ShopListBox::draw(Graphics *graphics)
if (needDraw)
{
graphics->setColor(*backgroundColor);
- graphics->fillRectangle(Rectangle(mPadding, y + mPadding,
+ graphics->fillRectangle(Rect(mPadding, y + mPadding,
width, mRowHeight));
}
diff --git a/src/gui/widgets/shortcutcontainer.cpp b/src/gui/widgets/shortcutcontainer.cpp
index b059098b5..d3781b421 100644
--- a/src/gui/widgets/shortcutcontainer.cpp
+++ b/src/gui/widgets/shortcutcontainer.cpp
@@ -73,7 +73,7 @@ void ShortcutContainer::widgetResized(const Event &event A_UNUSED)
int ShortcutContainer::getIndexFromGrid(const int pointX,
const int pointY) const
{
- const Rectangle tRect = Rectangle(0, 0,
+ const Rect tRect = Rect(0, 0,
mGridWidth * mBoxWidth, mGridHeight * mBoxHeight);
int index = ((pointY / mBoxHeight) * mGridWidth) + pointX / mBoxWidth;
diff --git a/src/gui/widgets/spellshortcutcontainer.cpp b/src/gui/widgets/spellshortcutcontainer.cpp
index f1d4d0cd1..ed92b62e1 100644
--- a/src/gui/widgets/spellshortcutcontainer.cpp
+++ b/src/gui/widgets/spellshortcutcontainer.cpp
@@ -116,7 +116,7 @@ void SpellShortcutContainer::draw(Graphics *graphics)
const int itemId = getItemByIndex(i);
if (selectedId >= 0 && itemId == selectedId)
{
- graphics->drawRectangle(Rectangle(itemX + 1, itemY + 1,
+ graphics->drawRectangle(Rect(itemX + 1, itemY + 1,
mBoxWidth - 1, mBoxHeight - 1));
}
diff --git a/src/gui/widgets/tabbedarea.cpp b/src/gui/widgets/tabbedarea.cpp
index 7f58a061e..d2bb24720 100644
--- a/src/gui/widgets/tabbedarea.cpp
+++ b/src/gui/widgets/tabbedarea.cpp
@@ -457,7 +457,7 @@ void TabbedArea::widgetResized(const Event &event A_UNUSED)
{
if (mFollowDownScroll && height != 0)
{
- const Rectangle &rect = w->getDimension();
+ const Rect &rect = w->getDimension();
if (rect.height != 0 && rect.height > height + 2)
{
if (scr->getVerticalScrollAmount()
@@ -722,7 +722,7 @@ void TabbedArea::setSize(int width, int height)
adjustSize();
}
-void TabbedArea::setDimension(const Rectangle &dimension)
+void TabbedArea::setDimension(const Rect &dimension)
{
Widget::setDimension(dimension);
adjustSize();
diff --git a/src/gui/widgets/tabbedarea.h b/src/gui/widgets/tabbedarea.h
index 0ad4fbbe6..dbaa4334b 100644
--- a/src/gui/widgets/tabbedarea.h
+++ b/src/gui/widgets/tabbedarea.h
@@ -222,7 +222,7 @@ class TabbedArea final : public ActionListener,
void setSize(int width, int height);
- void setDimension(const Rectangle &dimension);
+ void setDimension(const Rect &dimension);
void death(const Event &event);
diff --git a/src/gui/widgets/tabs/chattab.cpp b/src/gui/widgets/tabs/chattab.cpp
index 70018f999..fe979ae5a 100644
--- a/src/gui/widgets/tabs/chattab.cpp
+++ b/src/gui/widgets/tabs/chattab.cpp
@@ -407,7 +407,7 @@ void ChatTab::chatInput(const std::string &message)
void ChatTab::scroll(const int amount)
{
const int range = mScrollArea->getHeight() / 8 * amount;
- Rectangle scr;
+ Rect scr;
scr.y = mScrollArea->getVerticalScrollAmount() + range;
scr.height = abs(range);
mTextOutput->showPart(scr);
diff --git a/src/gui/widgets/tabs/setup_audio.cpp b/src/gui/widgets/tabs/setup_audio.cpp
index c5cb8cef1..c8e625ca4 100644
--- a/src/gui/widgets/tabs/setup_audio.cpp
+++ b/src/gui/widgets/tabs/setup_audio.cpp
@@ -156,7 +156,7 @@ Setup_Audio::Setup_Audio(const Widget2 *const widget) :
new SetupItemCheckBox(_("Download music"), "",
"download-music", this, "download-musicEvent");
- setDimension(Rectangle(0, 0, 550, 350));
+ setDimension(Rect(0, 0, 550, 350));
}
Setup_Audio::~Setup_Audio()
diff --git a/src/gui/widgets/tabs/setup_chat.cpp b/src/gui/widgets/tabs/setup_chat.cpp
index 94a65163b..7ac88ab0a 100644
--- a/src/gui/widgets/tabs/setup_chat.cpp
+++ b/src/gui/widgets/tabs/setup_chat.cpp
@@ -195,7 +195,7 @@ Setup_Chat::Setup_Chat(const Widget2 *const widget) :
new SetupItemCheckBox(_("Show motd server message on start"), "",
"showmotd", this, "showmotdEvent");
- setDimension(Rectangle(0, 0, 550, 350));
+ setDimension(Rect(0, 0, 550, 350));
}
void Setup_Chat::apply()
diff --git a/src/gui/widgets/tabs/setup_colors.cpp b/src/gui/widgets/tabs/setup_colors.cpp
index 41be92454..ac6bf2837 100644
--- a/src/gui/widgets/tabs/setup_colors.cpp
+++ b/src/gui/widgets/tabs/setup_colors.cpp
@@ -192,7 +192,7 @@ Setup_Colors::Setup_Colors(const Widget2 *const widget) :
mGradTypeText->setCaption("");
- setDimension(Rectangle(0, 0, 365, 350));
+ setDimension(Rect(0, 0, 365, 350));
}
Setup_Colors::~Setup_Colors()
diff --git a/src/gui/widgets/tabs/setup_input.cpp b/src/gui/widgets/tabs/setup_input.cpp
index ed371b364..b04937881 100644
--- a/src/gui/widgets/tabs/setup_input.cpp
+++ b/src/gui/widgets/tabs/setup_input.cpp
@@ -164,7 +164,7 @@ Setup_Input::Setup_Input(const Widget2 *const widget) :
if (config.getIntValue("screenwidth") >= 730)
width += 100;
- setDimension(Rectangle(0, 0, width, 350));
+ setDimension(Rect(0, 0, width, 350));
}
Setup_Input::~Setup_Input()
diff --git a/src/gui/widgets/tabs/setup_joystick.cpp b/src/gui/widgets/tabs/setup_joystick.cpp
index ba5c37b5a..b3d7b78b9 100644
--- a/src/gui/widgets/tabs/setup_joystick.cpp
+++ b/src/gui/widgets/tabs/setup_joystick.cpp
@@ -94,7 +94,7 @@ Setup_Joystick::Setup_Joystick(const Widget2 *const widget) :
place(0, 4, mCalibrateLabel);
place(0, 5, mCalibrateButton);
- setDimension(Rectangle(0, 0, 365, 75));
+ setDimension(Rect(0, 0, 365, 75));
}
Setup_Joystick::~Setup_Joystick()
diff --git a/src/gui/widgets/tabs/setup_mods.cpp b/src/gui/widgets/tabs/setup_mods.cpp
index 657d09658..b30b84c16 100644
--- a/src/gui/widgets/tabs/setup_mods.cpp
+++ b/src/gui/widgets/tabs/setup_mods.cpp
@@ -44,7 +44,7 @@ Setup_Mods::Setup_Mods(const Widget2 *const widget) :
ContainerPlacer place = h.getPlacer(0, 0);
place(0, 0, mScroll, 10, 10);
- setDimension(Rectangle(0, 0, 550, 350));
+ setDimension(Rect(0, 0, 550, 350));
}
Setup_Mods::~Setup_Mods()
diff --git a/src/gui/widgets/tabs/setup_other.cpp b/src/gui/widgets/tabs/setup_other.cpp
index 678dc2672..e4801506c 100644
--- a/src/gui/widgets/tabs/setup_other.cpp
+++ b/src/gui/widgets/tabs/setup_other.cpp
@@ -391,7 +391,7 @@ Setup_Other::Setup_Other(const Widget2 *const widget) :
new SetupItemDropDown(_("Screen density override"), "",
"screenDensity", this, "screenDensityEvent", mDensityList, 100);
- setDimension(Rectangle(0, 0, 550, 350));
+ setDimension(Rect(0, 0, 550, 350));
}
Setup_Other::~Setup_Other()
diff --git a/src/gui/widgets/tabs/setup_perfomance.cpp b/src/gui/widgets/tabs/setup_perfomance.cpp
index cd92c8542..5a0566ec2 100644
--- a/src/gui/widgets/tabs/setup_perfomance.cpp
+++ b/src/gui/widgets/tabs/setup_perfomance.cpp
@@ -154,7 +154,7 @@ Setup_Perfomance::Setup_Perfomance(const Widget2 *const widget) :
"", "uselonglivesounds", this,
"uselonglivesoundsEvent");
- setDimension(Rectangle(0, 0, 550, 350));
+ setDimension(Rect(0, 0, 550, 350));
}
Setup_Perfomance::~Setup_Perfomance()
diff --git a/src/gui/widgets/tabs/setup_players.cpp b/src/gui/widgets/tabs/setup_players.cpp
index a612a51c4..01bb60f53 100644
--- a/src/gui/widgets/tabs/setup_players.cpp
+++ b/src/gui/widgets/tabs/setup_players.cpp
@@ -100,5 +100,5 @@ Setup_Players::Setup_Players(const Widget2 *const widget) :
new SetupItemCheckBox(_("Use special diagonal speed in players moving"),
"", "useDiagonalSpeed", this, "useDiagonalSpeedEvent");
- setDimension(Rectangle(0, 0, 550, 350));
+ setDimension(Rect(0, 0, 550, 350));
}
diff --git a/src/gui/widgets/tabs/setup_relations.cpp b/src/gui/widgets/tabs/setup_relations.cpp
index 1f85a23b4..1458ecd25 100644
--- a/src/gui/widgets/tabs/setup_relations.cpp
+++ b/src/gui/widgets/tabs/setup_relations.cpp
@@ -260,7 +260,7 @@ Setup_Relations::Setup_Relations(const Widget2 *const widget) :
player_relations.addListener(this);
- setDimension(Rectangle(0, 0, 500, 350));
+ setDimension(Rect(0, 0, 500, 350));
}
Setup_Relations::~Setup_Relations()
diff --git a/src/gui/widgets/tabs/setup_theme.cpp b/src/gui/widgets/tabs/setup_theme.cpp
index 4bde4b35e..419400853 100644
--- a/src/gui/widgets/tabs/setup_theme.cpp
+++ b/src/gui/widgets/tabs/setup_theme.cpp
@@ -367,7 +367,7 @@ Setup_Theme::Setup_Theme(const Widget2 *const widget) :
else if (size > maxWidth)
size = maxWidth;
- setDimension(Rectangle(0, 0, size, 500));
+ setDimension(Rect(0, 0, size, 500));
}
Setup_Theme::~Setup_Theme()
diff --git a/src/gui/widgets/tabs/setup_touch.cpp b/src/gui/widgets/tabs/setup_touch.cpp
index d141691d4..fb50ab4d5 100644
--- a/src/gui/widgets/tabs/setup_touch.cpp
+++ b/src/gui/widgets/tabs/setup_touch.cpp
@@ -121,7 +121,7 @@ Setup_Touch::Setup_Touch(const Widget2 *const widget) :
key, this, event, mActionsList, 250);
}
- setDimension(Rectangle(0, 0, 550, 350));
+ setDimension(Rect(0, 0, 550, 350));
}
Setup_Touch::~Setup_Touch()
diff --git a/src/gui/widgets/tabs/setup_video.cpp b/src/gui/widgets/tabs/setup_video.cpp
index b587e8d5d..f55dceaa4 100644
--- a/src/gui/widgets/tabs/setup_video.cpp
+++ b/src/gui/widgets/tabs/setup_video.cpp
@@ -304,7 +304,7 @@ Setup_Video::Setup_Video(const Widget2 *const widget) :
if (config.getIntValue("screenwidth") >= 730)
width += 100;
- setDimension(Rectangle(0, 0, width, 300));
+ setDimension(Rect(0, 0, width, 300));
}
Setup_Video::~Setup_Video()
diff --git a/src/gui/widgets/tabs/setup_visual.cpp b/src/gui/widgets/tabs/setup_visual.cpp
index 525d73d07..9666b224a 100644
--- a/src/gui/widgets/tabs/setup_visual.cpp
+++ b/src/gui/widgets/tabs/setup_visual.cpp
@@ -203,7 +203,7 @@ Setup_Visual::Setup_Visual(const Widget2 *const widget) :
new SetupItemCheckBox(_("Allow screensaver to run"),
"", "allowscreensaver", this, "allowscreensaverEvent");
- setDimension(Rectangle(0, 0, 550, 350));
+ setDimension(Rect(0, 0, 550, 350));
}
Setup_Visual::~Setup_Visual()
diff --git a/src/gui/widgets/textbox.cpp b/src/gui/widgets/textbox.cpp
index 6fce77641..a1ce0e61d 100644
--- a/src/gui/widgets/textbox.cpp
+++ b/src/gui/widgets/textbox.cpp
@@ -357,7 +357,7 @@ void TextBox::draw(Graphics* graphics)
if (mOpaque)
{
graphics->setColor(mBackgroundColor);
- graphics->fillRectangle(Rectangle(0, 0, getWidth(), getHeight()));
+ graphics->fillRectangle(Rect(0, 0, getWidth(), getHeight()));
}
Font *const font = getFont();
diff --git a/src/gui/widgets/textfield.cpp b/src/gui/widgets/textfield.cpp
index 3b4c5302c..78a2826d5 100644
--- a/src/gui/widgets/textfield.cpp
+++ b/src/gui/widgets/textfield.cpp
@@ -662,7 +662,7 @@ void TextField::handleCopy() const
void TextField::drawCaret(Graphics* graphics, int x)
{
- const Rectangle *const clipArea = graphics->getCurrentClipArea();
+ const Rect *const clipArea = graphics->getCurrentClipArea();
if (!clipArea)
return;
diff --git a/src/gui/widgets/textpreview.cpp b/src/gui/widgets/textpreview.cpp
index 3772f3bbc..8ac49bfd6 100644
--- a/src/gui/widgets/textpreview.cpp
+++ b/src/gui/widgets/textpreview.cpp
@@ -93,7 +93,7 @@ void TextPreview::draw(Graphics* graphics)
static_cast<int>(mBGColor->g),
static_cast<int>(mBGColor->b),
static_cast<int>(mAlpha * 255.0F)));
- graphics->fillRectangle(Rectangle(0, 0,
+ graphics->fillRectangle(Rect(0, 0,
mDimension.width, mDimension.height));
}
@@ -109,7 +109,7 @@ void TextPreview::draw(Graphics* graphics)
static_cast<int>(mTextBGColor->g),
static_cast<int>(mTextBGColor->b),
intAlpha));
- graphics->fillRectangle(Rectangle(mPadding, mPadding, x, y));
+ graphics->fillRectangle(Rect(mPadding, mPadding, x, y));
}
}
diff --git a/src/gui/widgets/widget.cpp b/src/gui/widgets/widget.cpp
index f93107bc5..23edadac0 100644
--- a/src/gui/widgets/widget.cpp
+++ b/src/gui/widgets/widget.cpp
@@ -162,7 +162,7 @@ void Widget::_setParent(Widget* parent)
void Widget::setWidth(int width)
{
- Rectangle newDimension = mDimension;
+ Rect newDimension = mDimension;
newDimension.width = width;
setDimension(newDimension);
@@ -170,7 +170,7 @@ void Widget::setWidth(int width)
void Widget::setHeight(int height)
{
- Rectangle newDimension = mDimension;
+ Rect newDimension = mDimension;
newDimension.height = height;
setDimension(newDimension);
@@ -178,7 +178,7 @@ void Widget::setHeight(int height)
void Widget::setX(int x)
{
- Rectangle newDimension = mDimension;
+ Rect newDimension = mDimension;
newDimension.x = x;
setDimension(newDimension);
@@ -186,7 +186,7 @@ void Widget::setX(int x)
void Widget::setY(int y)
{
- Rectangle newDimension = mDimension;
+ Rect newDimension = mDimension;
newDimension.y = y;
setDimension(newDimension);
@@ -194,16 +194,16 @@ void Widget::setY(int y)
void Widget::setPosition(int x, int y)
{
- Rectangle newDimension = mDimension;
+ Rect newDimension = mDimension;
newDimension.x = x;
newDimension.y = y;
setDimension(newDimension);
}
-void Widget::setDimension(const Rectangle& dimension)
+void Widget::setDimension(const Rect& dimension)
{
- const Rectangle oldDimension = mDimension;
+ const Rect oldDimension = mDimension;
mDimension = dimension;
if (mDimension.width != oldDimension.width
@@ -229,7 +229,7 @@ unsigned int Widget::getFrameSize() const
return mFrameSize;
}
-const Rectangle& Widget::getDimension() const
+const Rect& Widget::getDimension() const
{
return mDimension;
}
@@ -434,7 +434,7 @@ void Widget::getAbsolutePosition(int& x, int& y) const
mParent->getAbsolutePosition(parentX, parentY);
- const Rectangle &rect = mParent->getChildrenArea();
+ const Rect &rect = mParent->getChildrenArea();
x = parentX + mDimension.x + rect.x;
y = parentY + mDimension.y + rect.y;
}
@@ -492,7 +492,7 @@ void Widget::setTabOutEnabled(bool enabled)
void Widget::setSize(int width, int height)
{
- Rectangle newDimension = mDimension;
+ Rect newDimension = mDimension;
newDimension.width = width;
newDimension.height = height;
@@ -589,9 +589,9 @@ const std::list<FocusListener*>& Widget::_getFocusListeners()
return mFocusListeners;
}
-Rectangle Widget::getChildrenArea()
+Rect Widget::getChildrenArea()
{
- return Rectangle(0, 0, 0, 0);
+ return Rect(0, 0, 0, 0);
}
FocusHandler* Widget::_getInternalFocusHandler()
@@ -669,7 +669,7 @@ void Widget::distributeShownEvent()
}
}
-void Widget::showPart(Rectangle rectangle)
+void Widget::showPart(Rect rectangle)
{
if (mParent)
mParent->showWidgetPart(this, rectangle);
diff --git a/src/gui/widgets/widget.h b/src/gui/widgets/widget.h
index 08f1456b0..e05844e4c 100644
--- a/src/gui/widgets/widget.h
+++ b/src/gui/widgets/widget.h
@@ -69,7 +69,7 @@
#include <string>
#include "gui/color.h"
-#include "gui/rectangle.h"
+#include "gui/rect.h"
#include "gui/widgets/widget2.h"
@@ -313,7 +313,7 @@ class Widget : public Widget2
* @see getDimension, setX, getX, setY, getY, setPosition
* @since 0.1.0
*/
- void setDimension(const Rectangle& dimension);
+ void setDimension(const Rect& dimension);
/**
* Gets the dimension of the widget. The dimension is
@@ -323,7 +323,7 @@ class Widget : public Widget2
* @see getDimension, setX, getX, setY, getY, setPosition
* @since 0.1.0
*/
- const Rectangle& getDimension() const A_WARN_UNUSED;
+ const Rect& getDimension() const A_WARN_UNUSED;
/**
* Sets the widget to be fosusable, or not.
@@ -888,7 +888,7 @@ class Widget : public Widget2
* @see BasicContainer::drawChildren
* @since 0.1.0
*/
- virtual Rectangle getChildrenArea() A_WARN_UNUSED;
+ virtual Rect getChildrenArea() A_WARN_UNUSED;
/**
* Gets the internal focus handler used.
@@ -960,7 +960,7 @@ class Widget : public Widget2
* @since 0.1.0
*/
virtual void showWidgetPart(Widget* widget A_UNUSED,
- Rectangle area A_UNUSED)
+ Rect area A_UNUSED)
{ }
/**
@@ -997,7 +997,7 @@ class Widget : public Widget2
* @param rectangle The rectangle to be shown.
* @since 0.8.0
*/
- virtual void showPart(Rectangle rectangle);
+ virtual void showPart(Rect rectangle);
protected:
/**
@@ -1165,7 +1165,7 @@ class Widget : public Widget2
/**
* Holds the dimension of the widget.
*/
- Rectangle mDimension;
+ Rect mDimension;
/**
* Holds the frame size of the widget.
diff --git a/src/gui/widgets/window.cpp b/src/gui/widgets/window.cpp
index 9a43a305b..8b106b489 100644
--- a/src/gui/widgets/window.cpp
+++ b/src/gui/widgets/window.cpp
@@ -543,7 +543,7 @@ void Window::setResizable(const bool r)
void Window::widgetResized(const Event &event A_UNUSED)
{
- const Rectangle area = getChildrenArea();
+ const Rect area = getChildrenArea();
if (mGrip)
{
@@ -860,7 +860,7 @@ void Window::mouseDragged(MouseEvent &event)
{
const int dx = event.getX() - mDragOffsetX;
const int dy = event.getY() - mDragOffsetY;
- Rectangle newDim = getDimension();
+ Rect newDim = getDimension();
if (mouseResize & (TOP | BOTTOM))
{
@@ -1258,7 +1258,7 @@ void Window::redraw()
{
if (mLayout)
{
- const Rectangle area = getChildrenArea();
+ const Rect area = getChildrenArea();
int w = area.width;
int h = area.height;
mLayout->reflow(w, h);
@@ -1294,9 +1294,9 @@ void Window::ensureOnScreen()
mDimension.y = 0;
}
-Rectangle Window::getWindowArea() const
+Rect Window::getWindowArea() const
{
- return Rectangle(mPadding,
+ return Rect(mPadding,
mPadding,
mDimension.width - mPadding * 2,
mDimension.height - mPadding * 2);
@@ -1321,9 +1321,9 @@ bool Window::getOptionBool(const std::string &name, const bool def) const
return def;
}
-Rectangle Window::getChildrenArea()
+Rect Window::getChildrenArea()
{
- return Rectangle(mPadding,
+ return Rect(mPadding,
mTitleBarHeight,
mDimension.width - mPadding * 2,
mDimension.height - mPadding - mTitleBarHeight);
diff --git a/src/gui/widgets/window.h b/src/gui/widgets/window.h
index 9bf1b4b7a..7cf34c67c 100644
--- a/src/gui/widgets/window.h
+++ b/src/gui/widgets/window.h
@@ -450,7 +450,7 @@ class Window : public gcn::Container,
*/
int getGuiAlpha() const A_WARN_UNUSED;
- Rectangle getWindowArea() const A_WARN_UNUSED;
+ Rect getWindowArea() const A_WARN_UNUSED;
bool isResizeAllowed(const MouseEvent &event) const A_WARN_UNUSED;
@@ -574,7 +574,7 @@ class Window : public gcn::Container,
bool isOpaque()
{ return mOpaque; }
- virtual Rectangle getChildrenArea();
+ virtual Rect getChildrenArea();
/**
* Resizes the window to fit the content.
@@ -688,9 +688,9 @@ class Window : public gcn::Container,
Image *mGrip; /**< Resize grip */
Window *mParent; /**< The parent window */
Layout *mLayout; /**< Layout handler */
- Rectangle mCloseRect; /**< Close button rectangle */
- Rectangle mStickyRect; /**< Sticky button rectangle */
- Rectangle mGripRect; /**< Resize grip rectangle */
+ Rect mCloseRect; /**< Close button rectangle */
+ Rect mStickyRect; /**< Sticky button rectangle */
+ Rect mGripRect; /**< Resize grip rectangle */
std::string mWindowName; /**< Name of the window */
int mMinWinWidth; /**< Minimum window width */
int mMinWinHeight; /**< Minimum window height */