diff options
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/popupmenu.cpp | 7 | ||||
| -rw-r--r-- | src/gui/widgets/tabbedarea.cpp | 19 | ||||
| -rw-r--r-- | src/gui/widgets/tabbedarea.h | 4 |
3 files changed, 3 insertions, 27 deletions
diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp index dfd85815..1098cd3a 100644 --- a/src/gui/popupmenu.cpp +++ b/src/gui/popupmenu.cpp @@ -82,7 +82,7 @@ void PopupMenu::showPopup(int x, int y, Being *being) //mBrowserBox->addRow("@@follow|Follow " + name + "@@"); //mBrowserBox->addRow("@@buddy|Add " + name + " to Buddy List@@"); mBrowserBox->addRow(strprintf(_("@@guild|Invite %s@@"), name.c_str())); - //mBrowserBox->addRow(strprintf(_("@@party|Invite %s to join your party@@"), name.c_str())); + mBrowserBox->addRow(strprintf(_("@@party|Invite %s to join your party@@"), name.c_str())); } break; @@ -144,15 +144,14 @@ void PopupMenu::handleLink(const std::string& link) mBeing != NULL && mBeing->getType() == Being::PLAYER) { - player_node->invite(mBeing); + player_node->inviteToGuild(mBeing); } - /* // Add player to your party else if (link == "party") { + player_node->inviteToParty(mBeing); } - */ /* // Follow Player action diff --git a/src/gui/widgets/tabbedarea.cpp b/src/gui/widgets/tabbedarea.cpp index cf486971..a36688e2 100644 --- a/src/gui/widgets/tabbedarea.cpp +++ b/src/gui/widgets/tabbedarea.cpp @@ -130,22 +130,3 @@ void TabbedArea::removeTab(gcn::Tab *tab) adjustSize(); adjustTabPositions(); } - -void TabbedArea::adjustSize() -{ - int maxTabHeight = 0; - unsigned int i; - for (i = 0; i < mTabs.size(); i++) - { - if (mTabs[i].first->getHeight() > maxTabHeight) - { - maxTabHeight = mTabs[i].first->getHeight(); - } - } - - mTabContainer->setSize(getWidth() - getFrameSize(), maxTabHeight); - - mWidgetContainer->setPosition(1, maxTabHeight + 1); - mWidgetContainer->setSize(getWidth() - getFrameSize(), - getHeight() - maxTabHeight - getFrameSize()); -} diff --git a/src/gui/widgets/tabbedarea.h b/src/gui/widgets/tabbedarea.h index b822d9c9..0c5d18f7 100644 --- a/src/gui/widgets/tabbedarea.h +++ b/src/gui/widgets/tabbedarea.h @@ -66,10 +66,6 @@ class TabbedArea : public gcn::TabbedArea */ void removeTab(gcn::Tab *tab); - /** - * Overload adjustSize as it seems faulty - */ - void adjustSize(); }; #endif |