OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Qt6: Fix usage of deprecated QApplication::fontMetrics()

Browse Source
This commit is contained in:
Kristian Bendiksen 2024-10-02 12:34:24 +02:00
parent bf1c7f4b04
commit 3797aa8211
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafQShortenedLabel.cpp
View File

@ -79,7 +79,7 @@ QSize QShortenedLabel::minimumSizeHint() const
{ {
const int minimumNumberOfCharacters = 10; const int minimumNumberOfCharacters = 10;
QFontMetrics fontMetrics = QApplication::fontMetrics(); QFontMetrics fontMetrics( QApplication::font() );
QString fullLabelText = fullText(); QString fullLabelText = fullText();
QString shortenedText = fullLabelText.left( minimumNumberOfCharacters ); QString shortenedText = fullLabelText.left( minimumNumberOfCharacters );
int minimumWidth = fontMetrics.horizontalAdvance( shortenedText ); int minimumWidth = fontMetrics.horizontalAdvance( shortenedText );
@ -118,8 +118,8 @@ QSize QShortenedLabel::minimumSizeHint() const
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
QSize QShortenedLabel::sizeHint() const QSize QShortenedLabel::sizeHint() const
{ {
QFontMetrics fontMetrics = QApplication::fontMetrics(); QFontMetrics fontMetrics( QApplication::font() );
QString labelText = fullText(); QString labelText = fullText();
QStringList labelLines = labelText.split( "\n" ); QStringList labelLines = labelText.split( "\n" );
int maxLineWidth = 0; int maxLineWidth = 0;
@ -147,8 +147,8 @@ void QShortenedLabel::resizeEvent( QResizeEvent* event )
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void caf::QShortenedLabel::resizeText( QSize paintSize ) void caf::QShortenedLabel::resizeText( QSize paintSize )
{ {
QString labelText = fullText(); QString labelText = fullText();
QFontMetrics fontMetrics = QApplication::fontMetrics(); QFontMetrics fontMetrics( QApplication::font() );
QStringList labelLines = labelText.split( "\n" ); QStringList labelLines = labelText.split( "\n" );
int maxLineWidth = 0; int maxLineWidth = 0;

2
Fwk/AppFwk/cafUserInterface/cafPdmUiColorEditor.cpp
View File

@ -153,7 +153,7 @@ QWidget* PdmUiColorEditor::createEditorWidget( QWidget* parent )
m_colorPreviewLabel->setText( QLatin1String( "..." ) ); m_colorPreviewLabel->setText( QLatin1String( "..." ) );
m_colorPreviewLabel->setAlignment( Qt::AlignCenter ); m_colorPreviewLabel->setAlignment( Qt::AlignCenter );
QFontMetrics fontMetrics = QApplication::fontMetrics(); QFontMetrics fontMetrics( QApplication::font() );
buttonLayout->addWidget( m_colorPreviewLabel ); buttonLayout->addWidget( m_colorPreviewLabel );
m_colorSelectionButton->setMinimumWidth( fontMetrics.boundingRect( m_colorPreviewLabel->text() ).width() + 15 ); m_colorSelectionButton->setMinimumWidth( fontMetrics.boundingRect( m_colorPreviewLabel->text() ).width() + 15 );