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

#5385 Make QShortenedLabel slightly longer

Browse Source
This commit is contained in:
Gaute Lindkvist 2020-01-29 09:54:52 +01:00
parent 5973e8c330
commit 0d67a179ef
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -79,10 +79,12 @@ QString QShortenedLabel::fullText() const
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
QSize QShortenedLabel::minimumSizeHint() const QSize QShortenedLabel::minimumSizeHint() const
{ {
int minimumWidth = 20; const int minimumNumberOfCharacters = 10;
QFontMetrics fontMetrics = QApplication::fontMetrics(); QFontMetrics fontMetrics = QApplication::fontMetrics();
QString fullLabelText = fullText(); QString fullLabelText = fullText();
QString shortenedText = fullLabelText.left(minimumNumberOfCharacters);
int minimumWidth = fontMetrics.width(shortenedText);
if (!fullLabelText.isEmpty()) if (!fullLabelText.isEmpty())
{ {
@ -101,7 +103,12 @@ QSize QShortenedLabel::minimumSizeHint() const
maxFirstWordWidth = std::max(maxFirstWordWidth, wordWidth); maxFirstWordWidth = std::max(maxFirstWordWidth, wordWidth);
} }
} }
int minimumTextWidth = std::min(maxLineWidth, maxFirstWordWidth); int minimumTextWidth = maxFirstWordWidth;
// Prefer the max line width if there's just one character between them
if (maxFirstWordWidth + fontMetrics.maxWidth() >= maxLineWidth)
minimumTextWidth = maxLineWidth;
minimumWidth = std::max(minimumWidth, minimumTextWidth); minimumWidth = std::max(minimumWidth, minimumTextWidth);
} }
QSize minimumSize = QLabel::minimumSizeHint(); QSize minimumSize = QLabel::minimumSizeHint();