diff options
| author | TrickyLeifa <date.epoch@gmail.com> | 2024-05-17 23:54:41 +0200 |
|---|---|---|
| committer | TrickyLeifa <date.epoch@gmail.com> | 2024-05-18 00:48:55 +0200 |
| commit | 657145035cd66c18ae777e1272fd5221dddca0ef (patch) | |
| tree | f9b86a917a2e422c8f93b05f06ebd112f1c700cb /src/scrolltext.cpp | |
| parent | 0500a5426013e97b80cae1de0b19a117cc1bbaa7 (diff) | |
Reimplemented unit tests, ...
* Reimplemented unit tests and simplified addition of new tests
* Minimal support of Qt is now 5.15
Diffstat (limited to 'src/scrolltext.cpp')
| -rw-r--r-- | src/scrolltext.cpp | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/scrolltext.cpp b/src/scrolltext.cpp index a45d6abd..8e25692e 100644 --- a/src/scrolltext.cpp +++ b/src/scrolltext.cpp @@ -42,12 +42,8 @@ void ScrollText::setSeparator(QString separator) void ScrollText::updateText() { timer.stop(); -#if QT_VERSION > QT_VERSION_CHECK(5, 11, 0) - singleTextWidth = fontMetrics().horizontalAdvance(m_text); -#else - singleTextWidth = fontMetrics().boundingRect(_text).width(); -#endif + singleTextWidth = fontMetrics().horizontalAdvance(m_text); scrollEnabled = (singleTextWidth > width() - leftMargin * 2); if (scrollEnabled) @@ -62,11 +58,7 @@ void ScrollText::updateText() } staticText.prepare(QTransform(), font()); -#if QT_VERSION > QT_VERSION_CHECK(5, 11, 0) wholeTextSize = QSize(fontMetrics().horizontalAdvance(staticText.text()), fontMetrics().height()); -#else - wholeTextSize = QSize(fontMetrics().boundingRect(staticText.text()).width(), fontMetrics().height()); -#endif } void ScrollText::paintEvent(QPaintEvent *) |