preserve-emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-07-11 01:25:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

Extract the adhoc gamelist code for reuse

Browse Source
This commit is contained in:
Henrik Rydgård
2026-04-06 12:49:10 -06:00
parent a486984acc
commit db592f6a57
2 changed files with 62 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/AdhocServerScreen.cpp
+50 -53
View File
@@ -164,21 +164,6 @@ private:
bool hasRelay_ = false;
};
class AdhocServerCompactInfo : public UI::LinearLayout {
public:
AdhocServerCompactInfo(const AdhocServerListEntry &entry, UI::LayoutParams *layoutParams = nullptr);
void Draw(UIContext &dc) override {
UI::LinearLayout::Draw(dc);
// Underline
dc.Draw()->DrawImageCenterTexel(dc.GetTheme().whiteImage, bounds_.x, bounds_.y2() - 2, bounds_.x2(), bounds_.y2(), dc.GetTheme().popupTitleStyle.fgColor);
}
void GetContentDimensions(const UIContext &dc, float &w, float &h) const override {
w = 500; h = 100;
}
private:
AdhocServerListEntry entry_;
};
AdhocServerCompactInfo::AdhocServerCompactInfo(const AdhocServerListEntry &entry, UI::LayoutParams *layoutParams)
: UI::LinearLayout(ORIENT_HORIZONTAL, new UI::LinearLayoutParams(UI::FILL_PARENT, UI::WRAP_CONTENT, UI::Margins(5.0f, 0.0f))), entry_(entry) {
using namespace UI;
@@ -208,6 +193,12 @@ AdhocServerCompactInfo::AdhocServerCompactInfo(const AdhocServerListEntry &entry
});
}
void AdhocServerCompactInfo::Draw(UIContext &dc) {
UI::LinearLayout::Draw(dc);
// Underline
dc.Draw()->DrawImageCenterTexel(dc.GetTheme().whiteImage, bounds_.x, bounds_.y2() - 2, bounds_.x2(), bounds_.y2(), dc.GetTheme().popupTitleStyle.fgColor);
}
static UI::View *CreateInfoItemWithButton(std::string_view text, ImageID buttonImage, std::function<void(UI::EventParams &)> onClick) {
using namespace UI;
LinearLayout *line = new LinearLayout(ORIENT_HORIZONTAL, new LinearLayoutParams(FILL_PARENT, WRAP_CONTENT, Margins(12, 0)));
@@ -252,6 +243,49 @@ AdhocServerInfoScreen::AdhocServerInfoScreen(const AdhocServerListEntry &entry)
}
}
void CreateAdhocServerGameList(UI::ViewGroup *content, const std::vector<AdhocGame> &games, bool requestInProgress) {
using namespace UI;
auto ni = GetI18NCategory(I18NCat::NETWORKING);
if (games.empty()) {
if (requestInProgress) {
// Still loading. Show a spinner.
content->Add(new Spinner(nullptr, 0, new LinearLayoutParams(WRAP_CONTENT, WRAP_CONTENT, 1.0f, Gravity::G_CENTER)));
} else {
content->Add(new TextView(ni->T("No games in progress on this server")));
}
return;
}
for (const AdhocGame &game : games) {
std::string title = game.name + " - " + ApplySafeSubstitutions(ni->T("players: %1"), game.usercount) + " " + ApplySafeSubstitutions(ni->T("groups: %1"), (int)game.groups.size());
CollapsibleSection *gameSection = content->Add(new CollapsibleSection(title));
gameSection->Header()->SetUnderline(false);
for (const AdhocGroup &group : game.groups) {
if (group.usercount >= 1 && group.name == "Groupless") {
gameSection->Add(new TextView(" " + ApplySafeSubstitutions(ni->T("Players waiting: %1"), group.usercount)))->SetTextSize(TextSize::Small);
continue;
}
gameSection->Add(new TextView(" " + group.name + " - " + ApplySafeSubstitutions(ni->T("players: %1"), group.usercount)))->SetTextSize(TextSize::Small);
for (const AdhocUser &user : group.users) {
std::string portInfo;
if (!user.pdp_ports.empty()) {
portInfo += "PDP: ";
for (int port : user.pdp_ports) {
portInfo += std::to_string(port) + " ";
}
}
if (!user.ptp_ports.empty()) {
portInfo += "PTP: ";
for (int port : user.ptp_ports) {
portInfo += std::to_string(port) + " ";
}
}
gameSection->Add(new TextView(" " + user.name + " " + portInfo))->SetTextSize(TextSize::Tiny);
}
}
gameSection->SetOpen(false); // NOTE: Must be last!
}
}
void AdhocServerInfoScreen::CreatePopupContents(UI::ViewGroup *parent) {
using namespace UI;
auto pa = GetI18NCategory(I18NCat::PAUSE);
@@ -295,44 +329,7 @@ void AdhocServerInfoScreen::CreatePopupContents(UI::ViewGroup *parent) {
buttonStrip->Add(CreateLinkButton(entry_.statusXmlUrl, ni->T("Status")));
}
} else {
if (games_.empty()) {
if (statusRequest_) {
// Still loading. TODO: Show a spinner or something.
} else {
content->Add(new TextView(ni->T("No games in progress on this server")));
}
} else {
// content->Add(new InfoItem(ni->T("Games being played"), StringFromFormat("%zu", games_.size())));
for (const AdhocGame &game : games_) {
std::string title = game.name + " - " + ApplySafeSubstitutions(ni->T("players: %1"), game.usercount) + " " + ApplySafeSubstitutions(ni->T("groups: %1"), (int)game.groups.size());
CollapsibleSection *gameSection = content->Add(new CollapsibleSection(title));
gameSection->Header()->SetUnderline(false);
for (const AdhocGroup &group : game.groups) {
if (group.usercount >= 1 && group.name == "Groupless") {
gameSection->Add(new TextView(" " + ApplySafeSubstitutions(ni->T("Players waiting: %1"), group.usercount)))->SetTextSize(TextSize::Small);
continue;
}
gameSection->Add(new TextView(" " + group.name + " - " + ApplySafeSubstitutions(ni->T("players: %1"), group.usercount)))->SetTextSize(TextSize::Small);
for (const AdhocUser &user : group.users) {
std::string portInfo;
if (!user.pdp_ports.empty()) {
portInfo += "PDP: ";
for (int port : user.pdp_ports) {
portInfo += std::to_string(port) + " ";
}
}
if (!user.ptp_ports.empty()) {
portInfo += "PTP: ";
for (int port : user.ptp_ports) {
portInfo += std::to_string(port) + " ";
}
}
gameSection->Add(new TextView(" " + user.name + " " + portInfo))->SetTextSize(TextSize::Tiny);
}
}
gameSection->SetOpen(false); // NOTE: Must be last!
}
}
CreateAdhocServerGameList(content, games_, statusRequest_.get() ? true : false);
}
scroll->Add(content);
UI/AdhocServerScreen.h
+12
View File
@@ -30,6 +30,17 @@ struct AdhocGame {
std::vector<std::string> game_ids;
};
class AdhocServerCompactInfo : public UI::LinearLayout {
public:
AdhocServerCompactInfo(const AdhocServerListEntry &entry, UI::LayoutParams *layoutParams = nullptr);
void Draw(UIContext &dc) override;
void GetContentDimensions(const UIContext &dc, float &w, float &h) const override {
w = 500; h = 100;
}
private:
AdhocServerListEntry entry_;
};
// Later, this might also show games-in-progress.
// For now, it's just a simple metadata viewer.
class AdhocServerInfoScreen : public UI::PopupScreen {
@@ -103,3 +114,4 @@ private:
void AskToEditCurrentServer(int requestToken, ScreenManager *screenManager);
bool AdhocServerNameIsCustom();
void CreateAdhocServerGameList(UI::ViewGroup *content, const std::vector<AdhocGame> &games, bool requestInProgress);