From 0f30acc13f7f33363d47989ca6c5ab0dbfa28bdc Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Mon, 6 May 2019 13:45:08 +0200
Subject: [PATCH] [calamares] Fix off-center text in sidepane
- The text rectangle was **moved**, not shrunk-in-place. Add
the missing - sign for the right and bottom margin.
- While here, move from #define to constexpr.
---
.../progresstree/ProgressTreeDelegate.cpp | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
diff --git a/src/calamares/progresstree/ProgressTreeDelegate.cpp b/src/calamares/progresstree/ProgressTreeDelegate.cpp
index 5c83b70fd..9e21255d0 100644
--- a/src/calamares/progresstree/ProgressTreeDelegate.cpp
+++ b/src/calamares/progresstree/ProgressTreeDelegate.cpp
@@ -31,8 +31,8 @@
#include <QAbstractItemView>
#include <QPainter>
-#define ITEM_MARGIN 12
-#define VS_FONTSIZE CalamaresUtils::defaultFontSize() + 4
+static constexpr int const item_margin = 8;
+static inline int item_fontsize() { return CalamaresUtils::defaultFontSize() + 4; }
ProgressTreeDelegate::ProgressTreeDelegate( QAbstractItemView* parent )
: QStyledItemDelegate( parent )
@@ -50,11 +50,11 @@ ProgressTreeDelegate::sizeHint( const QStyleOptionViewItem& option,
QFont font = qApp->font();
- font.setPointSize( VS_FONTSIZE );
+ font.setPointSize( item_fontsize() );
QFontMetrics fm( font );
int height = fm.height();
- height += 2*ITEM_MARGIN; //margin
+ height += 2 * item_margin;
return QSize( option.rect.width(), height );
}
@@ -88,12 +88,9 @@ ProgressTreeDelegate::paintViewStep( QPainter* painter,
const QStyleOptionViewItem& option,
const QModelIndex& index ) const
{
- QRect textRect = option.rect.adjusted( ITEM_MARGIN,
- ITEM_MARGIN,
- ITEM_MARGIN,
- ITEM_MARGIN );
+ QRect textRect = option.rect.adjusted( item_margin, item_margin, -item_margin, -item_margin );
QFont font = qApp->font();
- font.setPointSize( VS_FONTSIZE );
+ font.setPointSize( item_fontsize() );
font.setBold( false );
painter->setFont( font );