jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-11-06 01:53:25 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

[Client] Fix alt badge and trail review findings

Browse source 
- Drop the dead VPN warning branch: rowVisible() already hides IP rows
  above the threshold, so setVpnThreshold(), its member and the spin-box
  connect never took effect.
- Dim IP rows at shared_count > 2 instead of > 1: the count already
  includes the investigated account, so every IP row was dimmed.
- Truncate backStack when a breadcrumb is clicked instead of pushing the
  current user again, so the trail keeps a single path and Back works.
- Word-wrap the trail label so a long chain cannot widen the tab.
- Extract the status/match pill painting into widgets/utility/pill_painter
  and use it from both delegates instead of duplicating it.
This commit is contained in:
Lukas Brübach 2026-11-01 12:21:16 +01:00
parent 89789dc317
commit 13e0608662
8 changed files with 120 additions and 92 deletions
Download patch file Download diff file Expand all files Collapse all files

35
cockatrice/src/interface/widgets/tabs/report_status_delegate.cpp
View file

@ -1,18 +1,13 @@
#include "report_status_delegate.h"
#include "../utility/pill_painter.h"
#include <QApplication>
#include <QPainter>
#include <QPalette>
#include <QStyle>
#include <QStyleOptionViewItem>
namespace
{
constexpr qreal PILL_ALPHA = 0.30;
constexpr int PILL_PAD_X = 10;
constexpr int PILL_PAD_Y = 4;
} // namespace
ReportStatusDelegate::ReportStatusDelegate(QObject *parent) : QStyledItemDelegate(parent)
{
}
@ -46,32 +41,14 @@ void ReportStatusDelegate::paint(QPainter *painter, const QStyleOptionViewItem &
return;
}
const QRect pillRect = opt.rect.adjusted(PILL_PAD_X / 2, PILL_PAD_Y / 2, -PILL_PAD_X / 2, -PILL_PAD_Y / 2);
if (pillRect.width() <= 0 || pillRect.height() <= 0) {
QStyledItemDelegate::paint(painter, opt, index);
return;
}
if (!selected) {
painter->save();
painter->setRenderHint(QPainter::Antialiasing, true);
QColor pill = opt.palette.color(tintRole);
pill.setAlphaF(PILL_ALPHA);
painter->setPen(Qt::NoPen);
painter->setBrush(pill);
painter->drawRoundedRect(pillRect, pillRect.height() / 2.0, pillRect.height() / 2.0);
painter->restore();
}
const QString elided =
opt.fontMetrics.elidedText(opt.text.isEmpty() ? status : opt.text, opt.textElideMode, pillRect.width());
const QPalette::ColorRole textRole = selected ? QPalette::HighlightedText : QPalette::WindowText;
QStyle *style = opt.widget != nullptr ? opt.widget->style() : QApplication::style();
style->drawItemText(painter, pillRect, Qt::AlignCenter, opt.palette, true, elided, textRole);
if (!pill_painter::paint(painter, opt, tintRole, textRole, opt.text.isEmpty() ? status : opt.text)) {
QStyledItemDelegate::paint(painter, opt, index);
}
}
QSize ReportStatusDelegate::sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const
{
const QSize hint = QStyledItemDelegate::sizeHint(option, index);
return hint + QSize(PILL_PAD_X, PILL_PAD_Y);
return hint + QSize(pill_painter::PAD_X, pill_painter::PAD_Y);
}