From dd3df0c3d2adb3601abfedea2142c015cf3442c5 Mon Sep 17 00:00:00 2001 From: Jared Adams Date: Thu, 13 Aug 2009 08:06:06 -0600 Subject: Fix initial sizing issue with TabbedAreas Also remove some commented code from ChatWindow --- src/gui/chat.cpp | 2 -- src/gui/widgets/tabbedarea.cpp | 3 ++- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/gui/chat.cpp b/src/gui/chat.cpp index 4cabf92e..f1814d93 100644 --- a/src/gui/chat.cpp +++ b/src/gui/chat.cpp @@ -100,8 +100,6 @@ ChatWindow::ChatWindow(): place(0, 0, mChatTabs, 3, 3); place(0, 3, mChatInput, 3); - //add(mChatTabs); - //add(mChatInput); loadWindowState(); diff --git a/src/gui/widgets/tabbedarea.cpp b/src/gui/widgets/tabbedarea.cpp index 681f99ec..13bb884b 100644 --- a/src/gui/widgets/tabbedarea.cpp +++ b/src/gui/widgets/tabbedarea.cpp @@ -82,10 +82,11 @@ gcn::Widget *TabbedArea::getCurrentWidget() void TabbedArea::addTab(gcn::Tab* tab, gcn::Widget* widget) { + gcn::TabbedArea::addTab(tab, widget); + int width = getWidth() - 2 * getFrameSize(); int height = getHeight() - 2 * getFrameSize() - mTabContainer->getHeight(); widget->setSize(width, height); - gcn::TabbedArea::addTab(tab, widget); } void TabbedArea::addTab(const std::string &caption, gcn::Widget *widget) -- cgit v1.2.3-60-g2f50