summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/socialwindow.cpp91
-rw-r--r--src/gui/socialwindow.h10
-rw-r--r--src/gui/widgets/avatarlistbox.cpp16
-rw-r--r--src/gui/widgets/tabbedarea.cpp11
4 files changed, 105 insertions, 23 deletions
diff --git a/src/gui/socialwindow.cpp b/src/gui/socialwindow.cpp
index 9ba64e9f..76235306 100644
--- a/src/gui/socialwindow.cpp
+++ b/src/gui/socialwindow.cpp
@@ -20,6 +20,7 @@
#include "gui/socialwindow.h"
+#include "client.h"
#include "event.h"
#include "guild.h"
#include "localplayer.h"
@@ -40,6 +41,7 @@
#include "gui/widgets/tabbedarea.h"
#include "net/net.h"
+#include "net/chathandler.h"
#include "net/guildhandler.h"
#include "net/partyhandler.h"
@@ -98,8 +100,8 @@ public:
mList = std::make_unique<AvatarListBox>(guild);
mScroll = std::make_unique<ScrollArea>(mList.get());
- mScroll->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_AUTO);
- mScroll->setVerticalScrollPolicy(gcn::ScrollArea::SHOW_ALWAYS);
+ mScroll->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
+ mScroll->setVerticalScrollPolicy(gcn::ScrollArea::SHOW_AUTO);
}
void action(const gcn::ActionEvent &event) override
@@ -173,7 +175,7 @@ public:
mList = std::make_unique<AvatarListBox>(party);
mScroll = std::make_unique<ScrollArea>(mList.get());
- mScroll->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_AUTO);
+ mScroll->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
mScroll->setVerticalScrollPolicy(gcn::ScrollArea::SHOW_AUTO);
}
@@ -231,6 +233,64 @@ private:
Party *mParty;
};
+class PlayerList : public AvatarListModel
+{
+public:
+ void setPlayers(const std::vector<Avatar*> &players)
+ {
+ delete_all(mPlayers);
+ mPlayers = players;
+ }
+
+ /**
+ * Returns the number of players in the list.
+ */
+ int getNumberOfElements() override
+ {
+ return mPlayers.size();
+ }
+
+ Avatar *getAvatarAt(int index) override
+ {
+ return mPlayers[index];
+ }
+
+private:
+ std::vector<Avatar*> mPlayers;
+};
+
+class PlayerListTab : public SocialTab
+{
+public:
+ PlayerListTab()
+ {
+ mPlayerList = new PlayerList;
+
+ mList = std::make_unique<AvatarListBox>(mPlayerList);
+ mScroll = std::make_unique<ScrollArea>(mList.get());
+
+ mScroll->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
+ mScroll->setVerticalScrollPolicy(gcn::ScrollArea::SHOW_AUTO);
+ }
+
+ ~PlayerListTab()
+ {
+ delete mPlayerList;
+ }
+
+ void setPlayers(const std::vector<Avatar*> &players)
+ {
+ mPlayerList->setPlayers(players);
+ }
+
+protected:
+ void invite() override {}
+ void leave() override {}
+
+private:
+ PlayerList *mPlayerList;
+};
+
/*class BuddyTab : public SocialTab
{
// TODO?
@@ -314,7 +374,12 @@ SocialWindow::SocialWindow() :
widgetResized(nullptr);
- mCreatePopup = new CreatePopup();
+ mCreatePopup = new CreatePopup;
+
+ mPlayerListTab = new PlayerListTab;
+ mPlayerListTab->setCaption(strprintf(_("Online (%zu)"), 0ul));
+
+ mTabs->addTab(mPlayerListTab, mPlayerListTab->mScroll.get());
if (local_player->getParty())
{
@@ -345,6 +410,7 @@ SocialWindow::~SocialWindow()
mPartyInviter.clear();
}
delete mCreatePopup;
+ delete mPlayerListTab;
}
bool SocialWindow::addTab(Guild *guild)
@@ -605,6 +671,23 @@ void SocialWindow::showPartyCreate()
mPartyCreateDialog->addActionListener(this);
}
+void SocialWindow::setPlayersOnline(const std::vector<Avatar*> &players)
+{
+ mPlayerListTab->setPlayers(players);
+ mPlayerListTab->setCaption(strprintf(_("Online (%zu)"), players.size()));
+}
+
+void SocialWindow::logic()
+{
+ if (mLastOnlineListUpdate == 0 || get_elapsed_time(mLastOnlineListUpdate) >= 18000)
+ {
+ Net::getChatHandler()->requestOnlineList();
+ mLastOnlineListUpdate = tick_time;
+ }
+
+ Window::logic();
+}
+
void SocialWindow::updateButtons()
{
bool hasTabs = mTabs->getNumberOfTabs() > 0;
diff --git a/src/gui/socialwindow.h b/src/gui/socialwindow.h
index 8575f3b2..b6865fb2 100644
--- a/src/gui/socialwindow.h
+++ b/src/gui/socialwindow.h
@@ -28,12 +28,15 @@
#include <string>
#include <map>
+#include <vector>
+class Avatar;
class Button;
class ConfirmDialog;
class CreatePopup;
class Guild;
class Party;
+class PlayerListTab;
class SocialTab;
class Tab;
class TabbedArea;
@@ -74,12 +77,17 @@ public:
void showPartyCreate();
+ void setPlayersOnline(const std::vector<Avatar*> &players);
+
+ void logic() override;
+
protected:
friend class SocialTab;
void updateButtons();
int mGuildInvited = 0;
+ int mLastOnlineListUpdate = 0;
ConfirmDialog *mGuildAcceptDialog = nullptr;
TextDialog *mGuildCreateDialog = nullptr;
@@ -92,6 +100,8 @@ protected:
CreatePopup *mCreatePopup;
+ PlayerListTab *mPlayerListTab;
+
Button *mCreateButton;
Button *mInviteButton;
Button *mLeaveButton;
diff --git a/src/gui/widgets/avatarlistbox.cpp b/src/gui/widgets/avatarlistbox.cpp
index 6fd0fcfb..ec3327b2 100644
--- a/src/gui/widgets/avatarlistbox.cpp
+++ b/src/gui/widgets/avatarlistbox.cpp
@@ -83,9 +83,6 @@ void AvatarListBox::draw(gcn::Graphics *gcnGraphics)
graphics->fillRectangle(gcn::Rectangle(0, fontHeight * mSelected,
getWidth(), fontHeight));
- int newWidth = 0;
- int width = 0;
-
// Draw the list elements
graphics->setColor(Theme::getThemeColor(Theme::TEXT));
for (int i = 0, y = 0;
@@ -116,27 +113,16 @@ void AvatarListBox::draw(gcn::Graphics *gcnGraphics)
// Draw Name
graphics->drawText(text, 15, y);
- width = graphics->getFont()->getWidth(text) + 17; // Extra right padding
-
- if (width > newWidth)
- {
- newWidth = width;
- }
-
if (a->getDisplayBold())
graphics->setFont(getFont());
}
-
- setWidth(newWidth);
}
void AvatarListBox::mousePressed(gcn::MouseEvent &event)
{
if (event.getButton() == gcn::MouseEvent::LEFT)
{
- int y = event.getY();
- setSelected(y / getFont()->getHeight());
- distributeActionEvent();
+ ListBox::mousePressed(event);
}
// TODO: Add support for context menu
else if (event.getButton() == gcn::MouseEvent::RIGHT)
diff --git a/src/gui/widgets/tabbedarea.cpp b/src/gui/widgets/tabbedarea.cpp
index 772a8e22..af0c11cb 100644
--- a/src/gui/widgets/tabbedarea.cpp
+++ b/src/gui/widgets/tabbedarea.cpp
@@ -87,8 +87,10 @@ void TabbedArea::addTab(gcn::Tab* tab, gcn::Widget* widget)
{
gcn::TabbedArea::addTab(tab, widget);
- widget->setSize(mWidgetContainer->getWidth(),
- mWidgetContainer->getHeight());
+ int frameSize = widget->getFrameSize();
+ widget->setPosition(frameSize, frameSize);
+ widget->setSize(mWidgetContainer->getWidth() - frameSize * 2,
+ mWidgetContainer->getHeight() - frameSize * 2);
updateTabsWidth();
updateArrowEnableState();
@@ -177,8 +179,9 @@ void TabbedArea::widgetResized(const gcn::Event &event)
if (gcn::Widget *w = getCurrentWidget())
{
- w->setSize(mWidgetContainer->getWidth(),
- mWidgetContainer->getHeight());
+ int frameSize = w->getFrameSize();
+ w->setSize(mWidgetContainer->getWidth() - frameSize * 2,
+ mWidgetContainer->getHeight() - frameSize * 2);
}
// Check whether there is room to show more tabs now.
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-24 10:09:55 +0000