From 1d62d3534caa830ed5edaf99396ed2144194eceb Mon Sep 17 00:00:00 2001
From: Gaute Lindkvist <lindkvis@gmail.com>
Date: Wed, 4 Dec 2019 14:13:26 +0100
Subject: [PATCH] Remove use of QFontMetrics width
---
ApplicationCode/UserInterface/RiuTextDialog.cpp | 2 +-
Fwk/AppFwk/cafUserInterface/cafPdmUiColorEditor.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ApplicationCode/UserInterface/RiuTextDialog.cpp b/ApplicationCode/UserInterface/RiuTextDialog.cpp
index bfb9962ce0..58c14ccad3 100644
--- a/ApplicationCode/UserInterface/RiuTextDialog.cpp
+++ b/ApplicationCode/UserInterface/RiuTextDialog.cpp
@@ -211,7 +211,7 @@ RiuTabbedTextDialog::RiuTabbedTextDialog( RiuTabbedTextProvider* textProvider, Q
textEdit->setFont( font );
textEdit->setContextMenuPolicy( Qt::NoContextMenu );
- auto fontWidth = QFontMetrics( font ).width( "m" );
+ auto fontWidth = QFontMetrics( font ).boundingRect( "m" ).width();
textEdit->setTabStopWidth( fontWidth * 4 );
m_tabWidget->addTab( textEdit, tabTitle );
diff --git a/Fwk/AppFwk/cafUserInterface/cafPdmUiColorEditor.cpp b/Fwk/AppFwk/cafUserInterface/cafPdmUiColorEditor.cpp
index e0f6e2f08a..28ada579ef 100644
--- a/Fwk/AppFwk/cafUserInterface/cafPdmUiColorEditor.cpp
+++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiColorEditor.cpp
@@ -143,7 +143,7 @@ QWidget* PdmUiColorEditor::createEditorWidget(QWidget * parent)
QFontMetrics fontMetrics = QApplication::fontMetrics();
buttonLayout->addWidget(m_colorPreviewLabel);
- m_colorSelectionButton->setMinimumWidth(fontMetrics.width(m_colorPreviewLabel->text()) + 15);
+ m_colorSelectionButton->setMinimumWidth(fontMetrics.boundingRect(m_colorPreviewLabel->text()).width() + 15);
layout->addWidget(m_colorTextLabel);
layout->addItem(new QSpacerItem(0, 0, QSizePolicy::Expanding, QSizePolicy::Ignored));