From ccc93d2c64f7c60b963022765a4f1b9519f731a9 Mon Sep 17 00:00:00 2001 From: Teo Mrnjavac Date: Wed, 2 Dec 2015 15:42:27 +0100 Subject: [PATCH] Better partition label square size. --- src/modules/partition/gui/PartitionPreview.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/modules/partition/gui/PartitionPreview.cpp b/src/modules/partition/gui/PartitionPreview.cpp index 93be53692..950837b3a 100644 --- a/src/modules/partition/gui/PartitionPreview.cpp +++ b/src/modules/partition/gui/PartitionPreview.cpp @@ -38,7 +38,8 @@ static const int LAYOUT_MARGIN = 8; static const int CORNER_RADIUS = 3; static const int EXTENDED_PARTITION_MARGIN = 4; static const int LABELS_MARGIN = 40; -static const int LABEL_PARTITION_SQUARE_MARGIN = 18; +static const int LABEL_PARTITION_SQUARE_MARGIN = + qMax( QFontMetrics( CalamaresUtils::defaultFont() ).ascent() - 2, 18 ); QStringList buildUnknownDisklabelTexts( Device* dev ) @@ -357,8 +358,11 @@ PartitionPreview::drawLabel( QPainter* painter, painter->setPen( Qt::gray ); width = qMax( width, textSize.width() ); } - drawPartitionSquare( painter, QRect( pos.x(), pos.y() - 3, - 13, 13 ), color ); + drawPartitionSquare( painter, QRect( pos.x(), + pos.y() - 3, + LABEL_PARTITION_SQUARE_MARGIN - 5, + LABEL_PARTITION_SQUARE_MARGIN - 5 ), + color ); painter->setPen( Qt::black ); }