blakeridgway/supercell-wx
1
0
Fork 0
mirror of https://github.com/ciphervance/supercell-wx.git synced 2025-10-31 13:20:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

First pass fixes from discussions. Mostly linter fixes

Browse source
This commit is contained in:
AdenKoperczak 2025-01-11 10:32:21 -05:00
parent 91b4d6c2c2
commit dc284974b3
14 changed files with 107 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

15
scwx-qt/source/scwx/qt/model/marker_model.cpp
View file

@ -129,7 +129,20 @@ QVariant MarkerModel::data(const QModelIndex& index, int role) const
break;
break;
case static_cast<int>(Column::Icon):
if (role == Qt::ItemDataRole::DecorationRole)
if (role == Qt::ItemDataRole::DisplayRole)
{
std::optional<types::MarkerIconInfo> icon =
p->markerManager_->get_icon(markerInfo->iconName);
if (icon)
{
return QString::fromStdString(icon->shortName);
}
else
{
return {};
}
}
else if (role == Qt::ItemDataRole::DecorationRole)
{
std::optional<types::MarkerIconInfo> icon =
p->markerManager_->get_icon(markerInfo->iconName);