summaryrefslogtreecommitdiff
path: root/src/gui/widgets/tabbedarea.cpp
diff options
context:
space:
mode:
authorPhilipp Sehmisch <crush@themanaworld.org>2009-08-30 16:38:36 +0200
committerPhilipp Sehmisch <crush@themanaworld.org>2009-08-30 16:38:36 +0200
commitab0d3af8a9ff299ed766f17eef2e662de41c4d69 (patch)
tree07c52f86428792351af86df80565ddf3219fc277 /src/gui/widgets/tabbedarea.cpp
parentc9181484b53f5b1a05a8a952f88416fd7d095d67 (diff)
parent03e5eaec783ed1519a7552cc69a0a2d3cf5ccf0c (diff)
downloadmana-client-ab0d3af8a9ff299ed766f17eef2e662de41c4d69.tar.gz
mana-client-ab0d3af8a9ff299ed766f17eef2e662de41c4d69.tar.bz2
mana-client-ab0d3af8a9ff299ed766f17eef2e662de41c4d69.tar.xz
mana-client-ab0d3af8a9ff299ed766f17eef2e662de41c4d69.zip
Merge branch 'master' of git@gitorious.org:tmw/mainline
Diffstat (limited to 'src/gui/widgets/tabbedarea.cpp')
-rw-r--r--src/gui/widgets/tabbedarea.cpp14
1 files changed, 11 insertions, 3 deletions
diff --git a/src/gui/widgets/tabbedarea.cpp b/src/gui/widgets/tabbedarea.cpp
index 13bb884b..dd2e62dd 100644
--- a/src/gui/widgets/tabbedarea.cpp
+++ b/src/gui/widgets/tabbedarea.cpp
@@ -28,6 +28,8 @@ TabbedArea::TabbedArea() : gcn::TabbedArea()
{
mWidgetContainer->setOpaque(false);
addWidgetListener(this);
+
+ widgetResized(NULL);
}
int TabbedArea::getNumberOfTabs() const
@@ -161,14 +163,20 @@ void TabbedArea::setSelectedTab(gcn::Tab *tab)
if (newTab)
newTab->setCurrent();
+
+ widgetResized(NULL);
}
void TabbedArea::widgetResized(const gcn::Event &event)
{
- int width = getWidth() - 2 * getFrameSize();
- int height = getHeight() - 2 * getFrameSize() - mTabContainer->getHeight();
+ int width = getWidth() - 2 * getFrameSize()
+ - 2 * mWidgetContainer->getFrameSize();
+ int height = getHeight() - 2 * getFrameSize() - mWidgetContainer->getY()
+ - 2 * mWidgetContainer->getFrameSize();
mWidgetContainer->setSize(width, height);
+
gcn::Widget *w = getCurrentWidget();
if (w)
- w->setSize(width, height);
+ w->setSize(width,
+ height);
}