Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Improve design of instance group header #1286

Merged
merged 8 commits into from
Jul 17, 2023
Merged

Improve design of instance group header #1286

Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7033e28
update instance group header to more modern style
Jun 28, 2023
66461ac
some positioning adjustments, deleted the line
Jun 28, 2023
6b3b119
give ungrouped instances a group header
Jun 28, 2023
54d88e4
use QString.isEmpty()
Jun 28, 2023
534d156
format VisualGroup.cpp file
Jun 28, 2023
1dc7f80
4 clang-tidy changes, update copyright info
Jun 28, 2023
8211bef
removed magic 5, removed unnecessary QPainter function calls
Jun 28, 2023
81c0a1c
antialiasing for all painting, make hitbox fullwidth
Jul 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
132 changes: 28 additions & 104 deletions launcher/ui/instanceview/VisualGroup.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,138 +157,62 @@ VisualGroup::HitResults VisualGroup::hitScan(const QPoint &pos) const

void VisualGroup::drawHeader(QPainter *painter, const QStyleOptionViewItem &option)
{
painter->setRenderHint(QPainter::Antialiasing);

const QRect optRect = option.rect;
QRect optRect = option.rect;
optRect.setTop(optRect.top() + 7);
QFont font(QApplication::font());
font.setBold(true);
const QFontMetrics fontMetrics = QFontMetrics(font);

QColor outlineColor = option.palette.text().color();
outlineColor.setAlphaF(0.35);
int centerHeight = optRect.top() + fontMetrics.height()/2;

//BEGIN: top left corner
{
painter->save();
painter->setPen(outlineColor);
const QPointF topLeft(optRect.topLeft());
QRectF arc(topLeft, QSizeF(4, 4));
arc.translate(0.5, 0.5);
painter->drawArc(arc, 1440, 1440);
painter->restore();
}
//END: top left corner

//BEGIN: left vertical line
{
QPoint start(optRect.topLeft());
start.ry() += 3;
QPoint verticalGradBottom(optRect.topLeft());
verticalGradBottom.ry() += fontMetrics.height() + 5;
QLinearGradient gradient(start, verticalGradBottom);
gradient.setColorAt(0, outlineColor);
gradient.setColorAt(1, Qt::transparent);
painter->fillRect(QRect(start, QSize(1, fontMetrics.height() + 5)), gradient);
}
//END: left vertical line

//BEGIN: horizontal line
{
QPoint start(optRect.topLeft());
start.rx() += 3;
QPoint horizontalGradTop(optRect.topLeft());
horizontalGradTop.rx() += optRect.width() - 6;
painter->fillRect(QRect(start, QSize(optRect.width() - 6, 1)), outlineColor);
}
//END: horizontal line

//BEGIN: top right corner
{
painter->save();
painter->setPen(outlineColor);
QPointF topRight(optRect.topRight());
topRight.rx() -= 4;
QRectF arc(topRight, QSizeF(4, 4));
arc.translate(0.5, 0.5);
painter->drawArc(arc, 0, 1440);
painter->restore();
}
//END: top right corner
QPen pen;
pen.setWidth(2);
QColor penColor = option.palette.text().color();
penColor.setAlphaF(0.6);
pen.setColor(penColor);
painter->setPen(pen);

//BEGIN: right vertical line
{
QPoint start(optRect.topRight());
start.ry() += 3;
QPoint verticalGradBottom(optRect.topRight());
verticalGradBottom.ry() += fontMetrics.height() + 5;
QLinearGradient gradient(start, verticalGradBottom);
gradient.setColorAt(0, outlineColor);
gradient.setColorAt(1, Qt::transparent);
painter->fillRect(QRect(start, QSize(1, fontMetrics.height() + 5)), gradient);
}
//END: right vertical line
int arrowOffsetLeft = fontMetrics.height()/2 + 7;
int textOffsetLeft = arrowOffsetLeft *2;
int arrowSize = 6;

//BEGIN: checkboxy thing
//BEGIN: arrow
{
painter->save();
painter->setRenderHint(QPainter::Antialiasing, false);
painter->setFont(font);
QColor penColor(option.palette.text().color());
penColor.setAlphaF(0.6);
painter->setPen(penColor);
QRect iconSubRect(option.rect);
iconSubRect.setTop(iconSubRect.top() + 7);
iconSubRect.setLeft(iconSubRect.left() + 7);

int sizing = fontMetrics.height();
int even = ( (sizing - 1) % 2 );

iconSubRect.setHeight(sizing - even);
iconSubRect.setWidth(sizing - even);
painter->drawRect(iconSubRect);

painter->save();

/*
if(collapsed)
painter->drawText(iconSubRect, Qt::AlignHCenter | Qt::AlignVCenter, "+");
else
painter->drawText(iconSubRect, Qt::AlignHCenter | Qt::AlignVCenter, "-");
*/
painter->setBrush(option.palette.text());
painter->fillRect(iconSubRect.x(), iconSubRect.y() + iconSubRect.height() / 2,
iconSubRect.width(), 2, penColor);
if (collapsed)
{
painter->fillRect(iconSubRect.x() + iconSubRect.width() / 2, iconSubRect.y(), 2,
iconSubRect.height(), penColor);
QPolygon polygon;
if (collapsed) {
polygon << QPoint(arrowOffsetLeft - arrowSize/2, centerHeight - arrowSize) << QPoint(arrowOffsetLeft + arrowSize/2, centerHeight) << QPoint(arrowOffsetLeft - arrowSize/2, centerHeight + arrowSize);
painter->drawPolyline(polygon);
} else {
polygon << QPoint(arrowOffsetLeft - arrowSize, centerHeight - arrowSize/2) << QPoint(arrowOffsetLeft, centerHeight + arrowSize/2) << QPoint(arrowOffsetLeft + arrowSize, centerHeight - arrowSize/2);
painter->drawPolyline(polygon);
}

painter->restore();
}
//END: checkboxy thing
//END: arrow

//BEGIN: text
{
QRect textRect(option.rect);
textRect.setTop(textRect.top() + 7);
textRect.setLeft(textRect.left() + 7 + fontMetrics.height() + 7);
painter->setRenderHint(QPainter::Antialiasing);
TayouVR marked this conversation as resolved.
Show resolved Hide resolved
QRect textRect(optRect);
textRect.setTop(textRect.top());
textRect.setLeft(textOffsetLeft);
textRect.setHeight(fontMetrics.height());
textRect.setRight(textRect.right() - 7);

painter->save();
painter->setFont(font);
QColor penColor(option.palette.text().color());
penColor.setAlphaF(0.6);
painter->setPen(penColor);
painter->drawText(textRect, Qt::AlignLeft | Qt::AlignVCenter, text);
painter->drawText(textRect, Qt::AlignLeft | Qt::AlignVCenter, text != "" ? text : QObject::tr("Ungrouped"));
TheKodeToad marked this conversation as resolved.
Show resolved Hide resolved
painter->restore();
}
//END: text
}

int VisualGroup::totalHeight() const
{
return headerHeight() + 5 + contentHeight(); // FIXME: wtf is that '5'?
return headerHeight() + contentHeight();
}

int VisualGroup::headerHeight() const
Expand Down