diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2021-01-08 18:21:45 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2021-01-11 17:03:11 +0100 |
| commit | 89a65deec3a4fd6e9e843283109c70f0b2fb8a13 (patch) | |
| tree | a540eb6e63e8518a1ad510b77109f4f042ef1979 /examples/widgetbinding/wigglywidget.cpp | |
| parent | 5705cf87480f29e4e8f72bd47aaabb04466a7582 (diff) | |
Prepare the wiggly widget example for use in Designer
Refactor and brush up the code to C++/Python naming conventions.
Turn text/running into properties.
Most importantly, fix it to not crash when the text initially
is empty.
Task-number: PYSIDE-1455
Task-number: PYSIDE-841
Change-Id: If94558a453b1824ba54bd4f94808ced5798b2dc3
Reviewed-by: Christian Tismer <tismer@stackless.com>
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Diffstat (limited to 'examples/widgetbinding/wigglywidget.cpp')
| -rw-r--r-- | examples/widgetbinding/wigglywidget.cpp | 48 |
1 files changed, 37 insertions, 11 deletions
diff --git a/examples/widgetbinding/wigglywidget.cpp b/examples/widgetbinding/wigglywidget.cpp index ab549ef07..6d865d190 100644 --- a/examples/widgetbinding/wigglywidget.cpp +++ b/examples/widgetbinding/wigglywidget.cpp @@ -56,7 +56,7 @@ //! [0] WigglyWidget::WigglyWidget(QWidget *parent) - : QWidget(parent), step(0) + : QWidget(parent) { setBackgroundRole(QPalette::Midlight); setAutoFillBackground(true); @@ -64,8 +64,6 @@ WigglyWidget::WigglyWidget(QWidget *parent) QFont newFont = font(); newFont.setPointSize(newFont.pointSize() + 20); setFont(newFont); - - timer.start(60, this); } //! [0] @@ -73,12 +71,14 @@ WigglyWidget::WigglyWidget(QWidget *parent) void WigglyWidget::paintEvent(QPaintEvent * /* event */) //! [1] //! [2] { + if (m_text.isEmpty()) + return; static constexpr int sineTable[16] = { 0, 38, 71, 92, 100, 92, 71, 38, 0, -38, -71, -92, -100, -92, -71, -38 }; QFontMetrics metrics(font()); - int x = (width() - metrics.horizontalAdvance(text)) / 2; + int x = (width() - metrics.horizontalAdvance(m_text)) / 2; int y = (height() + metrics.ascent() - metrics.descent()) / 2; QColor color; //! [2] @@ -86,13 +86,14 @@ void WigglyWidget::paintEvent(QPaintEvent * /* event */) //! [3] QPainter painter(this); //! [3] //! [4] - for (int i = 0; i < text.size(); ++i) { - int index = (step + i) % 16; + for (int i = 0; i < m_text.size(); ++i) { + int index = (m_step + i) % 16; color.setHsv((15 - index) * 16, 255, 191); painter.setPen(color); - painter.drawText(x, y - ((sineTable[index] * metrics.height()) / 400), - QString(text[i])); - x += metrics.horizontalAdvance(text[i]); + const QChar c = m_text.at(i); + const int dy = (sineTable[index] * metrics.height()) / 400; + painter.drawText(x, y - dy, c); + x += metrics.horizontalAdvance(c); } } //! [4] @@ -101,11 +102,36 @@ void WigglyWidget::paintEvent(QPaintEvent * /* event */) void WigglyWidget::timerEvent(QTimerEvent *event) //! [5] //! [6] { - if (event->timerId() == timer.timerId()) { - ++step; + if (event->timerId() == m_timer.timerId()) { + ++m_step; update(); } else { QWidget::timerEvent(event); } //! [6] } + +QString WigglyWidget::text() const +{ + return m_text; +} + +void WigglyWidget::setText(const QString &newText) +{ + m_text = newText; +} + +bool WigglyWidget::isRunning() const +{ + return m_timer.isActive(); +} + +void WigglyWidget::setRunning(bool r) +{ + if (r == isRunning()) + return; + if (r) + m_timer.start(60, this); + else + m_timer.stop(); +} |