diff --git a/components/flatbutton.cpp b/components/flatbutton.cpp index 4cf8ee9..97a6f17 100644 --- a/components/flatbutton.cpp +++ b/components/flatbutton.cpp @@ -1,4 +1,5 @@ #include "flatbutton.h" +#include #include "lib/style.h" FlatButton::FlatButton(QWidget *parent) @@ -19,6 +20,15 @@ FlatButton::~FlatButton() { } +void FlatButton::paintEvent(QPaintEvent *event) +{ + Q_UNUSED(event) + + QPainter painter(this); + + painter.drawRect(rect().adjusted(0, 0, -1, -1)); +} + //#include //#include //#include diff --git a/components/flatbutton.h b/components/flatbutton.h index 1e7f853..258776c 100644 --- a/components/flatbutton.h +++ b/components/flatbutton.h @@ -11,6 +11,9 @@ public: explicit FlatButton(QWidget *parent = 0); explicit FlatButton(const QString &text, QWidget *parent = 0); ~FlatButton(); + +protected: + void paintEvent(QPaintEvent *event) Q_DECL_OVERRIDE; }; #endif // FLATBUTTON_H diff --git a/lib/ripple.cpp b/lib/ripple.cpp index 73225ba..7f92da0 100644 --- a/lib/ripple.cpp +++ b/lib/ripple.cpp @@ -26,7 +26,7 @@ void Ripple::setRadius(qreal radius) return; _radius = radius; - emit valueChanged(); + emit changed(); } void Ripple::setOpacity(qreal opacity) @@ -35,7 +35,7 @@ void Ripple::setOpacity(qreal opacity) return; _opacity = opacity; - emit valueChanged(); + emit changed(); } QPropertyAnimation *Ripple::animate(const QByteArray &property) diff --git a/lib/ripple.h b/lib/ripple.h index 73a8767..807979d 100644 --- a/lib/ripple.h +++ b/lib/ripple.h @@ -39,7 +39,7 @@ public: inline void startAnimation() { _group.start(); } signals: - void valueChanged(); + void changed(); void finished(); private: diff --git a/lib/rippleoverlay.cpp b/lib/rippleoverlay.cpp index c53147b..b1864a6 100644 --- a/lib/rippleoverlay.cpp +++ b/lib/rippleoverlay.cpp @@ -19,7 +19,7 @@ void RippleOverlay::addRipple(const QPoint &position, qreal radius) Ripple *ripple = new Ripple(position); ripple->setRadiusEndValue(radius); ripples.push_back(ripple); - connect(ripple, SIGNAL(valueChanged()), this, SLOT(update())); + connect(ripple, SIGNAL(changed()), this, SLOT(update())); connect(ripple, SIGNAL(finished()), this, SLOT(deleteRipple())); ripple->startAnimation(); }