diff options
| author | Philipp Sehmisch <crush@themanaworld.org> | 2009-08-30 16:38:36 +0200 |
|---|---|---|
| committer | Philipp Sehmisch <crush@themanaworld.org> | 2009-08-30 16:38:36 +0200 |
| commit | ab0d3af8a9ff299ed766f17eef2e662de41c4d69 (patch) | |
| tree | 07c52f86428792351af86df80565ddf3219fc277 /src/gui | |
| parent | c9181484b53f5b1a05a8a952f88416fd7d095d67 (diff) | |
| parent | 03e5eaec783ed1519a7552cc69a0a2d3cf5ccf0c (diff) | |
| download | Mana-ab0d3af8a9ff299ed766f17eef2e662de41c4d69.tar.gz Mana-ab0d3af8a9ff299ed766f17eef2e662de41c4d69.tar.bz2 Mana-ab0d3af8a9ff299ed766f17eef2e662de41c4d69.tar.xz Mana-ab0d3af8a9ff299ed766f17eef2e662de41c4d69.zip | |
Merge branch 'master' of git@gitorious.org:tmw/mainline
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/chat.cpp | 2 | ||||
| -rw-r--r-- | src/gui/widgets/tabbedarea.cpp | 14 | ||||
| -rw-r--r-- | src/gui/widgets/tabbedarea.h | 3 |
3 files changed, 13 insertions, 6 deletions
diff --git a/src/gui/chat.cpp b/src/gui/chat.cpp index f1814d93..c0597a64 100644 --- a/src/gui/chat.cpp +++ b/src/gui/chat.cpp @@ -453,7 +453,7 @@ void ChatWindow::whisper(const std::string &nick, if (i != mWhispers.end()) tab = i->second; - else if (config.getValue("whispertab", false)) + else if (config.getValue("whispertab", true)) tab = addWhisperTab(nick); if (tab) 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); } diff --git a/src/gui/widgets/tabbedarea.h b/src/gui/widgets/tabbedarea.h index a64d855f..7944b5d5 100644 --- a/src/gui/widgets/tabbedarea.h +++ b/src/gui/widgets/tabbedarea.h @@ -101,8 +101,7 @@ class TabbedArea : public gcn::TabbedArea, public gcn::WidgetListener int getContainerHeight() const { return mWidgetContainer->getHeight(); } - void setSelectedTab(unsigned int index) - { gcn::TabbedArea::setSelectedTab(index); } + using gcn::TabbedArea::setSelectedTab; void setSelectedTab(gcn::Tab *tab); |