mirror of
https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System.git
synced 2024-12-25 07:31:33 +08:00
Reverted change of last pull request because it broke ElidingLabel on Windows
This commit is contained in:
parent
078905181e
commit
a2b07fd97f
@ -157,11 +157,7 @@ QSize CElidingLabel::minimumSizeHint() const
|
||||
return QLabel::minimumSizeHint();
|
||||
}
|
||||
const QFontMetrics &fm = fontMetrics();
|
||||
#if (QT_VERSION >= QT_VERSION_CHECK(5, 11, 0))
|
||||
QSize size(fm.horizontalAdvance(d->Text), QLabel::sizeHint().height());
|
||||
#else
|
||||
QSize size(fm.width(d->Text), QLabel::sizeHint().height());
|
||||
#endif
|
||||
QSize size(fm.width(d->Text.left(2) + "…"), fm.height());
|
||||
return size;
|
||||
}
|
||||
|
||||
@ -174,11 +170,7 @@ QSize CElidingLabel::sizeHint() const
|
||||
return QLabel::sizeHint();
|
||||
}
|
||||
const QFontMetrics& fm = fontMetrics();
|
||||
#if (QT_VERSION >= QT_VERSION_CHECK(5, 11, 0))
|
||||
QSize size(fm.horizontalAdvance(d->Text), QLabel::sizeHint().height());
|
||||
#else
|
||||
QSize size(fm.width(d->Text), QLabel::sizeHint().height());
|
||||
#endif
|
||||
QSize size(fm.width(d->Text), QLabel::sizeHint().height());
|
||||
return size;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user