rename valueChanged signal to changed

This commit is contained in:
laserpants 2016-05-14 12:10:30 +03:00
parent e0dd848eb6
commit cdd16e1230
5 changed files with 17 additions and 4 deletions

View File

@ -1,4 +1,5 @@
#include "flatbutton.h" #include "flatbutton.h"
#include <QPainter>
#include "lib/style.h" #include "lib/style.h"
FlatButton::FlatButton(QWidget *parent) 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 <QDebug> //#include <QDebug>
//#include <QStylePainter> //#include <QStylePainter>
//#include <QMouseEvent> //#include <QMouseEvent>

View File

@ -11,6 +11,9 @@ public:
explicit FlatButton(QWidget *parent = 0); explicit FlatButton(QWidget *parent = 0);
explicit FlatButton(const QString &text, QWidget *parent = 0); explicit FlatButton(const QString &text, QWidget *parent = 0);
~FlatButton(); ~FlatButton();
protected:
void paintEvent(QPaintEvent *event) Q_DECL_OVERRIDE;
}; };
#endif // FLATBUTTON_H #endif // FLATBUTTON_H

View File

@ -26,7 +26,7 @@ void Ripple::setRadius(qreal radius)
return; return;
_radius = radius; _radius = radius;
emit valueChanged(); emit changed();
} }
void Ripple::setOpacity(qreal opacity) void Ripple::setOpacity(qreal opacity)
@ -35,7 +35,7 @@ void Ripple::setOpacity(qreal opacity)
return; return;
_opacity = opacity; _opacity = opacity;
emit valueChanged(); emit changed();
} }
QPropertyAnimation *Ripple::animate(const QByteArray &property) QPropertyAnimation *Ripple::animate(const QByteArray &property)

View File

@ -39,7 +39,7 @@ public:
inline void startAnimation() { _group.start(); } inline void startAnimation() { _group.start(); }
signals: signals:
void valueChanged(); void changed();
void finished(); void finished();
private: private:

View File

@ -19,7 +19,7 @@ void RippleOverlay::addRipple(const QPoint &position, qreal radius)
Ripple *ripple = new Ripple(position); Ripple *ripple = new Ripple(position);
ripple->setRadiusEndValue(radius); ripple->setRadiusEndValue(radius);
ripples.push_back(ripple); 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())); connect(ripple, SIGNAL(finished()), this, SLOT(deleteRipple()));
ripple->startAnimation(); ripple->startAnimation();
} }