fede/prismlauncher-crack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix server columns text other than name being invisible (#4475)

Browse Source
This commit is contained in:
Alexandru Ionut Tripon
2025-12-14 00:54:42 +02:00
committed by GitHub
parent caa69ee204 0d7244d56f
commit aa3d78b3dc
1 changed files with 18 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
launcher/ui/pages/instance/ServersPage.cpp
+18 -26
View File
@@ -112,11 +112,7 @@ struct Server {
QByteArray m_icon; QByteArray m_icon;
// Data - temporary // Data - temporary
bool m_checked = false;
bool m_up = false;
QString m_motd; // https://mctools.org/motd-creator
std::optional<int> m_currentPlayers; // nullopt if not calculated/calculating std::optional<int> m_currentPlayers; // nullopt if not calculated/calculating
int m_maxPlayers = 0;
}; };
static std::unique_ptr<nbt::tag_compound> parseServersDat(const QString& filename) static std::unique_ptr<nbt::tag_compound> parseServersDat(const QString& filename)
@@ -312,37 +308,33 @@ class ServersModel : public QAbstractListModel {
switch (role) { switch (role) {
case Qt::DecorationRole: { case Qt::DecorationRole: {
switch (column) { if (column == 0) {
case 0: { auto& bytes = m_servers[row].m_icon;
auto& bytes = m_servers[row].m_icon; if (bytes.size()) {
if (bytes.size()) { QPixmap px;
QPixmap px; if (px.loadFromData(bytes))
if (px.loadFromData(bytes)) return QIcon(px);
return QIcon(px);
}
return QIcon::fromTheme("unknown_server");
} }
return QIcon::fromTheme("unknown_server");
} else {
return QVariant();
}
}
case Qt::DisplayRole:
switch (column) {
case 0:
return m_servers[row].m_name;
case 1: case 1:
return m_servers[row].m_address; return m_servers[row].m_address;
default: case 2:
return QVariant();
}
case 2:
if (role == Qt::DisplayRole) {
if (m_servers[row].m_currentPlayers) { if (m_servers[row].m_currentPlayers) {
return *m_servers[row].m_currentPlayers; return *m_servers[row].m_currentPlayers;
} else { } else {
return "..."; return "...";
} }
} else { default:
return QVariant(); return QVariant();
} }
}
case Qt::DisplayRole:
if (column == 0)
return m_servers[row].m_name;
else
return QVariant();
case ServerPtrRole: case ServerPtrRole:
if (column == 0) if (column == 0)
return QVariant::fromValue<void*>((void*)&m_servers[row]); return QVariant::fromValue<void*>((void*)&m_servers[row]);