CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor: merge icon into name column

Browse Source 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
This commit is contained in:
Sefa Eyeoglu 2022-10-01 23:16:38 +02:00
parent 35b993c248
commit 822c98469f
No known key found for this signature in database
GPG Key ID: C10411294912A422
4 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
launcher/InstanceList.cpp
View File

@ -144,8 +144,6 @@ QVariant InstanceList::headerData(int section, Qt::Orientation orientation, int
} }
switch (section) { switch (section) {
case IconColumn:
return tr("Icon");
case NameColumn: case NameColumn:
return tr("Name"); return tr("Name");
case GameVersionColumn: case GameVersionColumn:
@ -167,7 +165,7 @@ QVariant InstanceList::data(const QModelIndex& index, int role) const
switch (role) { switch (role) {
case Qt::DecorationRole: { case Qt::DecorationRole: {
if (index.column() == IconColumn) if (index.column() == NameColumn)
return inst->iconKey(); return inst->iconKey();
break; break;
} }
@ -620,7 +618,7 @@ void InstanceList::propertiesChanged(BaseInstance* inst)
{ {
int i = getInstIndex(inst); int i = getInstIndex(inst);
if (i != -1) { if (i != -1) {
emit dataChanged(index(i, IconColumn), index(i, ColumnCount - 1)); emit dataChanged(index(i, NameColumn), index(i, ColumnCount - 1));
updateTotalPlayTime(); updateTotalPlayTime();
} }
} }

1
launcher/InstanceList.h
View File

@ -57,7 +57,6 @@ class InstanceList : public QAbstractTableModel {
int columnCount(const QModelIndex& parent = QModelIndex()) const override; int columnCount(const QModelIndex& parent = QModelIndex()) const override;
enum Column { enum Column {
IconColumn = 0,
NameColumn, NameColumn,
GameVersionColumn, GameVersionColumn,
PlayTimeColumn, PlayTimeColumn,

6
launcher/ui/instanceview/InstanceDelegate.cpp
View File

@ -24,8 +24,10 @@ InstanceDelegate::InstanceDelegate(QObject* parent) : QStyledItemDelegate(parent
void InstanceDelegate::initStyleOption(QStyleOptionViewItem* option, const QModelIndex& index) const void InstanceDelegate::initStyleOption(QStyleOptionViewItem* option, const QModelIndex& index) const
{ {
QStyledItemDelegate::initStyleOption(option, index); QStyledItemDelegate::initStyleOption(option, index);
if (index.column() == InstanceList::IconColumn) { if (index.column() == InstanceList::NameColumn) {
// make decoration fill cell, subtract default margins // make decoration fill cell, subtract default margins
option->decorationSize = option->rect.size().shrunkBy(QMargins(3, 1, 3, 1)); QSize decorationSize = QSize(option->rect.height(), option->rect.height());
decorationSize -= QSize(2, 2); // subtract 1px margin
option->decorationSize = decorationSize;
} }
} }

4
launcher/ui/instanceview/InstanceView.cpp
View File

@ -80,13 +80,11 @@ void InstanceView::createTable()
header->restoreState(QByteArray::fromBase64(APPLICATION->settings()->get("InstanceViewTableHeaderState").toByteArray())); header->restoreState(QByteArray::fromBase64(APPLICATION->settings()->get("InstanceViewTableHeaderState").toByteArray()));
header->setSectionsMovable(true); header->setSectionsMovable(true);
header->setSectionResizeMode(InstanceList::IconColumn, QHeaderView::Fixed);
header->setSectionResizeMode(InstanceList::NameColumn, QHeaderView::Stretch); header->setSectionResizeMode(InstanceList::NameColumn, QHeaderView::Stretch);
header->setSectionResizeMode(InstanceList::GameVersionColumn, QHeaderView::Interactive); header->setSectionResizeMode(InstanceList::GameVersionColumn, QHeaderView::Interactive);
header->setSectionResizeMode(InstanceList::PlayTimeColumn, QHeaderView::Interactive); header->setSectionResizeMode(InstanceList::PlayTimeColumn, QHeaderView::Interactive);
header->setSectionResizeMode(InstanceList::LastPlayedColumn, QHeaderView::Interactive); header->setSectionResizeMode(InstanceList::LastPlayedColumn, QHeaderView::Interactive);
m_table->setColumnWidth(InstanceList::IconColumn, m_rowHeight + 3 + 3); // padding left and right m_table->verticalHeader()->setDefaultSectionSize(m_rowHeight + 1 + 1); // padding top and bottom
m_table->verticalHeader()->setDefaultSectionSize(m_rowHeight + 1 + 1); // padding top and bottom
if (!APPLICATION->settings()->contains("InstanceViewTableHeaderState")) if (!APPLICATION->settings()->contains("InstanceViewTableHeaderState"))
m_table->sortByColumn(InstanceList::LastPlayedColumn, Qt::AscendingOrder); m_table->sortByColumn(InstanceList::LastPlayedColumn, Qt::AscendingOrder);