From f08736eab832ca60a51d8a72cdc5c84113ef2f24 Mon Sep 17 00:00:00 2001
From: morg <morgan.guimard@gmail.com>
Date: Fri, 12 Nov 2021 21:59:10 +0100
Subject: [PATCH] Resize tab label height depending on the font in use. Fix
 #1922

Commit amended to fix icon getting cut off in certain cases by Adam Honse <calcprogrammer1@gmail.com>
---
 qt/TabLabel.cpp | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/qt/TabLabel.cpp b/qt/TabLabel.cpp
index 7fd450c8..ef115350 100644
--- a/qt/TabLabel.cpp
+++ b/qt/TabLabel.cpp
@@ -1,4 +1,5 @@
 #include "TabLabel.h"
+#include <QFontMetrics>
 
 Ui::TabLabel::TabLabel(QString icon, QString name) :
     QWidget(nullptr),
@@ -7,7 +8,14 @@ Ui::TabLabel::TabLabel(QString icon, QString name) :
     ui->setupUi(this);
     ui->icon->setText("<img src=':/" + icon + "' height='16' width='16'  />");
     ui->name->setText(name);
-    setMinimumHeight(ui->name->height());
+
+    /*---------------------------------------------------------*\
+    | Make sure to properly set the tab label height depending  |
+    | on the font in use.                                       |
+    \*---------------------------------------------------------*/
+    QFontMetrics fontMetrics(font());
+    QRect rect = fontMetrics.boundingRect(0, 0, width(), height(), Qt::TextWordWrap | Qt::TextExpandTabs, name);
+    setFixedHeight(std::max(rect.height(), ui->icon->height()));
 }
 
 Ui::TabLabel::~TabLabel()