summaryrefslogtreecommitdiff
path: root/src/gui/scrollarea.cpp
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2008-04-07 15:23:07 +0000
committerBjørn Lindeijer <bjorn@lindeijer.nl>2008-04-07 15:23:07 +0000
commit92950d2f309550e21b33d851ef9bbf7906ce5e50 (patch)
tree18a6d2539c6e004e52cbebb1e61d8f8f0344f9a0 /src/gui/scrollarea.cpp
parent3f3ba5f3e18b0a5093e7275aee574ecd6f293ec6 (diff)
downloadmana-client-92950d2f309550e21b33d851ef9bbf7906ce5e50.tar.gz
mana-client-92950d2f309550e21b33d851ef9bbf7906ce5e50.tar.bz2
mana-client-92950d2f309550e21b33d851ef9bbf7906ce5e50.tar.xz
mana-client-92950d2f309550e21b33d851ef9bbf7906ce5e50.zip
Upgraded to Guichan 0.8.0 (merge from guichan-0.8 branch, except for
gcn::TabbedArea usage)
Diffstat (limited to 'src/gui/scrollarea.cpp')
-rw-r--r--src/gui/scrollarea.cpp24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/gui/scrollarea.cpp b/src/gui/scrollarea.cpp
index cd83b565..9c88f8e3 100644
--- a/src/gui/scrollarea.cpp
+++ b/src/gui/scrollarea.cpp
@@ -153,12 +153,12 @@ void ScrollArea::logic()
if (getHorizontalScrollPolicy() == gcn::ScrollArea::SHOW_NEVER)
{
content->setWidth(getChildrenArea().width -
- 2 * content->getBorderSize());
+ 2 * content->getFrameSize());
}
if (getVerticalScrollPolicy() == gcn::ScrollArea::SHOW_NEVER)
{
content->setHeight(getChildrenArea().height -
- 2 * content->getBorderSize());
+ 2 * content->getFrameSize());
}
}
}
@@ -204,15 +204,15 @@ void ScrollArea::draw(gcn::Graphics *graphics)
{
graphics->pushClipArea(getChildrenArea());
- if (content->getBorderSize() > 0)
+ if (content->getFrameSize() > 0)
{
gcn::Rectangle rec = content->getDimension();
- rec.x -= content->getBorderSize();
- rec.y -= content->getBorderSize();
- rec.width += 2 * content->getBorderSize();
- rec.height += 2 * content->getBorderSize();
+ rec.x -= content->getFrameSize();
+ rec.y -= content->getFrameSize();
+ rec.width += 2 * content->getFrameSize();
+ rec.height += 2 * content->getFrameSize();
graphics->pushClipArea(rec);
- content->drawBorder(graphics);
+ content->drawFrame(graphics);
graphics->popClipArea();
}
@@ -223,9 +223,9 @@ void ScrollArea::draw(gcn::Graphics *graphics)
}
}
-void ScrollArea::drawBorder(gcn::Graphics *graphics)
+void ScrollArea::drawFrame(gcn::Graphics *graphics)
{
- int bs = getBorderSize();
+ int bs = getFrameSize();
int w = getWidth() + bs * 2;
int h = getHeight() + bs * 2;
@@ -240,10 +240,10 @@ void ScrollArea::setOpaque(bool opaque)
mOpaque = opaque;
if (mOpaque) {
- setBorderSize(2);
+ setFrameSize(2);
}
else {
- setBorderSize(0);
+ setFrameSize(0);
}
}