Skip to content

Commit a2b07fd

Browse files
Reverted change of last pull request because it broke ElidingLabel on Windows
1 parent 0789051 commit a2b07fd

File tree

1 file changed

+2
-10
lines changed

1 file changed

+2
-10
lines changed

src/ElidingLabel.cpp

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -157,11 +157,7 @@ QSize CElidingLabel::minimumSizeHint() const
157157
return QLabel::minimumSizeHint();
158158
}
159159
const QFontMetrics &fm = fontMetrics();
160-
#if (QT_VERSION >= QT_VERSION_CHECK(5, 11, 0))
161-
QSize size(fm.horizontalAdvance(d->Text), QLabel::sizeHint().height());
162-
#else
163-
QSize size(fm.width(d->Text), QLabel::sizeHint().height());
164-
#endif
160+
QSize size(fm.width(d->Text.left(2) + ""), fm.height());
165161
return size;
166162
}
167163

@@ -174,11 +170,7 @@ QSize CElidingLabel::sizeHint() const
174170
return QLabel::sizeHint();
175171
}
176172
const QFontMetrics& fm = fontMetrics();
177-
#if (QT_VERSION >= QT_VERSION_CHECK(5, 11, 0))
178-
QSize size(fm.horizontalAdvance(d->Text), QLabel::sizeHint().height());
179-
#else
180-
QSize size(fm.width(d->Text), QLabel::sizeHint().height());
181-
#endif
173+
QSize size(fm.width(d->Text), QLabel::sizeHint().height());
182174
return size;
183175
}
184176

0 commit comments

Comments
 (0)