jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-17 04:27:45 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix subtype tally alignment by using grid layout instead of character padding

Browse source
This commit is contained in:
DawnFire42 2026-06-04 20:29:28 -04:00
parent ca6cb8fb91
commit 11bd4f5640
No known key found for this signature in database
GPG key ID: 24BB855EE2911B33
5 changed files with 74 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

82
cockatrice/src/game_graphics/game_view.cpp
View file

@ -2,10 +2,13 @@
#include "../client/settings/cache_settings.h"
#include "game_scene.h"
#include "libcockatrice/utility/qt_utils.h"
#include "selection_subtype_tally.h"
#include <QAction>
#include <QGridLayout>
#include <QLabel>
#include <QLayout>
#include <QResizeEvent>
#include <QRubberBand>
@ -74,10 +77,12 @@ GameView::GameView(GameScene *scene, QWidget *parent) : QGraphicsView(scene, par
totalCountLabel->setStyleSheet(totalCountLabelStyle);
totalCountLabel->hide();
subtypeCountLabel = new QLabel(this);
subtypeCountLabel->setStyleSheet(subtypeCountLabelStyle);
subtypeCountLabel->setTextFormat(Qt::RichText);
subtypeCountLabel->hide();
subtypeCountContainer = new QWidget(this);
subtypeCountContainer->setStyleSheet(subtypeCountLabelStyle);
subtypeCountLayout = new QGridLayout(subtypeCountContainer);
subtypeCountLayout->setContentsMargins(2, 2, 2, 2);
subtypeCountLayout->setSpacing(2);
subtypeCountContainer->hide();
}
void GameView::resizeEvent(QResizeEvent *event)
@ -172,13 +177,33 @@ void GameView::refreshShortcuts()
SettingsCache::instance().shortcuts().getShortcut("Player/aCloseMostRecentZoneView"));
}
QString GameView::buildSubtypeTallyText() const
void GameView::clearSubtypeLabels()
{
GameScene *gameScene = dynamic_cast<GameScene *>(scene());
if (!gameScene) {
return QString();
QtUtils::clearLayoutRec(subtypeCountLayout);
}
void GameView::rebuildSubtypeLabels(const QList<SubtypeEntry> &entries)
{
clearSubtypeLabels();
const QString nameStyle = QStringLiteral("color: white; font-size: 12px; background: transparent;");
const QString countStyle =
QStringLiteral("color: white; font-size: 14px; font-weight: bold; background: transparent;");
int row = 0;
for (const SubtypeEntry &entry : entries) {
auto *nameLabel = new QLabel(entry.name, subtypeCountContainer);
nameLabel->setStyleSheet(nameStyle);
nameLabel->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
subtypeCountLayout->addWidget(nameLabel, row, 0);
auto *countLabel = new QLabel(QString::number(entry.count), subtypeCountContainer);
countLabel->setStyleSheet(countStyle);
countLabel->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
subtypeCountLayout->addWidget(countLabel, row, 1);
++row;
}
return SelectionSubtypeTally::buildSubtypeTallyText(gameScene->selectedCards());
}
void GameView::updateSelectionCount(const QSize &viewSize)
@ -204,31 +229,46 @@ void GameView::updateSelectionCount(const QSize &viewSize)
}
if (!SettingsCache::instance().getShowSubtypeSelectionCount() || count <= 1) {
subtypeCountLabel->hide();
subtypeCountContainer->hide();
return;
}
QString subtypeText = buildSubtypeTallyText();
if (subtypeText.isEmpty()) {
subtypeCountLabel->hide();
GameScene *gameScene = dynamic_cast<GameScene *>(scene());
if (!gameScene) {
subtypeCountContainer->hide();
return;
}
subtypeCountLabel->setText(subtypeText);
subtypeCountLabel->adjustSize();
QList<MainTypeGroup> groups = SelectionSubtypeTally::countSubtypes(gameScene->selectedCards());
if (groups.isEmpty()) {
subtypeCountContainer->hide();
return;
}
int x = availableWidth - subtypeCountLabel->width() - kMarginInPixels;
QList<SubtypeEntry> entries;
for (const MainTypeGroup &group : groups) {
entries.append(group.subtypes);
}
if (entries.isEmpty()) {
subtypeCountContainer->hide();
return;
}
rebuildSubtypeLabels(entries);
subtypeCountContainer->adjustSize();
int x = availableWidth - subtypeCountContainer->width() - kMarginInPixels;
int y;
if (totalCountLabel->isVisible()) {
y = totalCountLabel->y() - subtypeCountLabel->height() - kSpacingBetweenLabels;
y = totalCountLabel->y() - subtypeCountContainer->height() - kSpacingBetweenLabels;
} else {
y = availableHeight - subtypeCountLabel->height() - kMarginInPixels;
y = availableHeight - subtypeCountContainer->height() - kMarginInPixels;
}
y = qMax(kMarginInPixels, y);
subtypeCountLabel->move(x, y);
subtypeCountLabel->show();
subtypeCountContainer->move(x, y);
subtypeCountContainer->show();
}