168492376
/
qt-material-widgets
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'fb'

This commit is contained in:
laserpants 2016-05-28 16:00:00 +03:00
parent 7add134412 7a70648dda
commit d6e237072b
7 changed files with 169 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
components/flatbutton.cpp
View File

@ -34,7 +34,9 @@ void FlatButtonPrivate::init()
q->setPalette(palette);
}
void FlatButtonPrivate::setPaletteColor(QPalette::ColorGroup group, QPalette::ColorRole role, const QString &themeColor)
void FlatButtonPrivate::setPaletteColor(QPalette::ColorGroup group,
QPalette::ColorRole role,
const QString &themeColor)
{
Q_Q(FlatButton);
@ -66,6 +68,13 @@ FlatButton::~FlatButton()
{
}
void FlatButton::setRippleStyle(RippleStyle style)
{
Q_D(FlatButton);
d->rippleStyle = style;
}
void FlatButton::setRole(Material::Role role)
{
Q_D(FlatButton);
@ -113,10 +122,13 @@ void FlatButton::paintEvent(QPaintEvent *event)
Q_D(FlatButton);
const qreal bgOpacity = d->delegate->backgroundOpacity();
const qreal haloOpacity = d->delegate->focusHaloOpacity();
const int hs = (width()/2)*d->delegate->focusHaloSize();
if (isEnabled() && bgOpacity > 0)
{
QPainter painter(this);
QPainter painter(this);
painter.setRenderHint(QPainter::Antialiasing);
if (isEnabled() && bgOpacity > 0) {
QBrush brush;
brush.setStyle(Qt::SolidPattern);
brush.setColor(d->delegate->backgroundColor());
@ -126,13 +138,23 @@ void FlatButton::paintEvent(QPaintEvent *event)
painter.drawRoundedRect(rect(), 3, 3);
}
QStylePainter painter(this);
if (isEnabled() && haloOpacity > 0) {
QBrush brush;
brush.setStyle(Qt::SolidPattern);
brush.setColor(palette().color(QPalette::Active, QPalette::ButtonText));
painter.setOpacity(haloOpacity);
painter.setBrush(brush);
painter.setPen(Qt::NoPen);
painter.drawEllipse(rect().center(), hs, hs);
}
QStylePainter style(this);
QStyleOptionButton option;
initStyleOption(&option);
option.features |= QStyleOptionButton::Flat;
painter.drawControl(QStyle::CE_PushButtonLabel, option);
style.drawControl(QStyle::CE_PushButtonLabel, option);
#ifdef DEBUG_LAYOUT
QPainter debug(this);
@ -148,9 +170,15 @@ void FlatButton::mousePressEvent(QMouseEvent *event)
{
Q_D(FlatButton);
if (FlatButton::NoRipple == d->rippleStyle) {
return;
}
QColor color = palette().color(QPalette::Active, QPalette::ButtonText);
Ripple *ripple = new Ripple(event->pos());
Ripple *ripple = new Ripple(FlatButton::CenteredRipple == d->rippleStyle
? rect().center() : event->pos());
ripple->setRadiusEndValue(100);
ripple->setOpacityStartValue(0.4);
ripple->setColor(color);

8
components/flatbutton.h
View File

@ -12,12 +12,20 @@ class FlatButton : public QPushButton
Q_OBJECT
public:
enum RippleStyle {
CenteredRipple,
PositionedRipple,
NoRipple
};
explicit FlatButton(QWidget *parent = 0);
explicit FlatButton(const QString &text, QWidget *parent = 0);
~FlatButton();
virtual void setRole(Material::Role role);
void setRippleStyle(RippleStyle style);
protected:
FlatButton(FlatButtonPrivate &d, QWidget *parent = 0);

135
components/flatbutton_internal.cpp
View File

@ -3,6 +3,7 @@
#include <QEventTransition>
#include <QSignalTransition>
#include <QPropertyAnimation>
#include <QSequentialAnimationGroup>
#include "flatbutton.h"
#include "lib/style.h"
@ -10,57 +11,48 @@ FlatButtonDelegate::FlatButtonDelegate(FlatButton *parent)
: QStateMachine(parent),
button(parent),
_normalState(new QState(this)),
_focusedState(new QState(this)),
_pressedState(new QState(this))
_normalFocusedState(new QState(this)),
_hoveredState(new QState(this)),
_hoveredFocusedState(new QState(this)),
_pressedState(new QState(this)),
_focusHaloSize(0.8)
{
setInitialState(_normalState);
assignProperties();
QAbstractTransition *transition;
QPropertyAnimation *animation;
addTransition(QEvent::Enter, _normalFocusedState, _hoveredFocusedState);
addTransition(QEvent::FocusIn, _normalState, _normalFocusedState);
addTransition(QEvent::FocusOut, _normalFocusedState, _normalState);
addTransition(QEvent::Enter, _normalState, _hoveredState);
addTransition(QEvent::Leave, _hoveredFocusedState, _normalFocusedState);
addTransition(QEvent::Leave, _hoveredState, _normalState);
addTransition(QEvent::MouseButtonPress, _hoveredState, _pressedState);
addTransition(QEvent::MouseButtonRelease, _pressedState, _hoveredFocusedState);
//
QSequentialAnimationGroup *group = new QSequentialAnimationGroup(this);
transition = new QEventTransition(button, QEvent::Enter);
transition->setTargetState(_focusedState);
QPropertyAnimation *grow = new QPropertyAnimation;
QPropertyAnimation *shrink = new QPropertyAnimation;
animation = new QPropertyAnimation(this, "backgroundOpacity");
animation->setDuration(140);
transition->addAnimation(animation);
_normalState->addTransition(transition);
grow->setTargetObject(this);
grow->setPropertyName("focusHaloSize");
grow->setStartValue(0.8);
grow->setEndValue(0.9);
grow->setEasingCurve(QEasingCurve::InOutSine);
grow->setDuration(840);
//
shrink->setTargetObject(this);
shrink->setPropertyName("focusHaloSize");
shrink->setStartValue(0.9);
shrink->setEndValue(0.8);
shrink->setEasingCurve(QEasingCurve::InOutSine);
shrink->setDuration(840);
transition = new QEventTransition(button, QEvent::Leave);
transition->setTargetState(_normalState);
animation = new QPropertyAnimation(this, "backgroundOpacity");
animation->setDuration(140);
transition->addAnimation(animation);
_focusedState->addTransition(transition);
//
transition = new QEventTransition(button, QEvent::MouseButtonPress);
transition->setTargetState(_pressedState);
animation = new QPropertyAnimation(this, "backgroundOpacity");
animation->setDuration(140);
transition->addAnimation(animation);
_focusedState->addTransition(transition);
//
transition = new QEventTransition(button, QEvent::MouseButtonRelease);
transition->setTargetState(_focusedState);
animation = new QPropertyAnimation(this, "backgroundOpacity");
animation->setDuration(500);
transition->addAnimation(animation);
_pressedState->addTransition(transition);
//
group->addAnimation(grow);
group->addAnimation(shrink);
group->setLoopCount(-1);
group->start();
start();
}
@ -91,6 +83,28 @@ QColor FlatButtonDelegate::backgroundColor() const
return _backgroundColor;
}
void FlatButtonDelegate::setFocusHaloOpacity(qreal opacity)
{
_focusHaloOpacity = opacity;
button->update();
}
qreal FlatButtonDelegate::focusHaloOpacity() const
{
return _focusHaloOpacity;
}
void FlatButtonDelegate::setFocusHaloSize(qreal size)
{
_focusHaloSize = size;
button->update();
}
qreal FlatButtonDelegate::focusHaloSize() const
{
return _focusHaloSize;
}
void FlatButtonDelegate::assignProperties()
{
QColor textColor = button->palette().color(QPalette::Active,
@ -98,10 +112,45 @@ void FlatButtonDelegate::assignProperties()
_normalState->assignProperty(this, "backgroundOpacity", 0);
_normalState->assignProperty(this, "backgroundColor", textColor);
_normalState->assignProperty(this, "focusHaloOpacity", 0);
_focusedState->assignProperty(this, "backgroundOpacity", 0.15);
_focusedState->assignProperty(this, "backgroundColor", textColor);
_normalFocusedState->assignProperty(this, "backgroundOpacity", 0);
_normalFocusedState->assignProperty(this, "backgroundColor", textColor);
_normalFocusedState->assignProperty(this, "focusHaloOpacity", 0.15);
_hoveredState->assignProperty(this, "backgroundOpacity", 0.15);
_hoveredState->assignProperty(this, "backgroundColor", textColor);
_hoveredState->assignProperty(this, "focusHaloOpacity", 0);
_hoveredFocusedState->assignProperty(this, "backgroundOpacity", 0.15);
_hoveredFocusedState->assignProperty(this, "backgroundColor", textColor);
_normalFocusedState->assignProperty(this, "focusHaloOpacity", 0.15);
_pressedState->assignProperty(this, "backgroundOpacity", 0.15);
_pressedState->assignProperty(this, "backgroundColor", textColor);
_pressedState->assignProperty(this, "focusHaloOpacity", 0);
}
void FlatButtonDelegate::addTransition(QEvent::Type eventType,
QState *fromState,
QState *toState)
{
QAbstractTransition *transition = new QEventTransition(button, eventType);
transition->setTargetState(toState);
QPropertyAnimation *animation;
animation = new QPropertyAnimation(this, "backgroundOpacity");
animation->setDuration(200);
transition->addAnimation(animation);
animation = new QPropertyAnimation(this, "backgroundColor");
animation->setDuration(200);
transition->addAnimation(animation);
animation = new QPropertyAnimation(this, "focusHaloOpacity");
animation->setDuration(350);
transition->addAnimation(animation);
fromState->addTransition(transition);
}

20
components/flatbutton_internal.h
View File

@ -4,14 +4,17 @@
#include <QStateMachine>
#include <QColor>
class QPropertyAnimation;
class FlatButton;
class FlatButtonDelegate : public QStateMachine
{
Q_OBJECT
Q_PROPERTY(qreal backgroundOpacity WRITE setBackgroundOpacity READ backgroundOpacity)
Q_PROPERTY(QColor backgroundColor WRITE setBackgroundColor READ backgroundColor)
Q_PROPERTY(qreal backgroundOpacity WRITE setBackgroundOpacity READ backgroundOpacity)
Q_PROPERTY(qreal focusHaloOpacity WRITE setFocusHaloOpacity READ focusHaloOpacity)
Q_PROPERTY(qreal focusHaloSize WRITE setFocusHaloSize READ focusHaloSize)
public:
FlatButtonDelegate(FlatButton *parent);
@ -23,18 +26,29 @@ public:
void setBackgroundColor(const QColor &color);
QColor backgroundColor() const;
void setFocusHaloOpacity(qreal opacity);
qreal focusHaloOpacity() const;
void setFocusHaloSize(qreal size);
qreal focusHaloSize() const;
void assignProperties();
private:
Q_DISABLE_COPY(FlatButtonDelegate)
void addTransition(QEvent::Type eventType, QState *fromState, QState *toState);
FlatButton *const button;
QState *const _normalState;
QState *const _focusedState;
QState *const _normalFocusedState;
QState *const _hoveredState;
QState *const _hoveredFocusedState;
QState *const _pressedState;
qreal _backgroundOpacity;
qreal _focusHaloOpacity;
qreal _focusHaloSize;
QColor _backgroundColor;
};
#endif // FLATBUTTON_INTERNAL_H

4
components/flatbutton_p.h
View File

@ -17,7 +17,8 @@ class FlatButtonPrivate
public:
FlatButtonPrivate(FlatButton *q)
: q_ptr(q),
role(Material::Default)
role(Material::Default),
rippleStyle(FlatButton::PositionedRipple)
{}
void init();
@ -27,6 +28,7 @@ public:
RippleOverlay *ripple;
FlatButtonDelegate *delegate;
Material::Role role;
FlatButton::RippleStyle rippleStyle;
};
#endif // FLATBUTTON_P_H

15
components/raisedbutton.cpp
View File

@ -129,17 +129,28 @@ void RaisedButton::paintEvent(QPaintEvent *event)
Q_D(RaisedButton);
QPainter painter(this);
painter.setRenderHint(QPainter::Antialiasing);
painter.save();
QBrush brush;
brush.setStyle(Qt::SolidPattern);
brush.setColor(palette().color(QPalette::Active, QPalette::Background));
painter.setBrush(brush);
painter.setPen(Qt::NoPen);
painter.drawRoundedRect(rect(), 3, 3);
const int hs = (width()/2)*d->delegate->focusHaloSize();
const qreal haloOpacity = d->delegate->focusHaloOpacity();
brush.setColor(palette().color(QPalette::Active, QPalette::ButtonText));
painter.setBrush(brush);
painter.setOpacity(haloOpacity);
painter.setPen(Qt::NoPen);
painter.drawEllipse(rect().center(), hs, hs);
painter.restore();
QStylePainter style(this);
QStyleOptionButton option;

2
lib/rippleoverlay.cpp
View File

@ -34,7 +34,7 @@ void RippleOverlay::paintEvent(QPaintEvent *event)
Q_UNUSED(event)
QPainter painter(this);
painter.setRenderHint(QPainter::Antialiasing);
//painter.setRenderHint(QPainter::Antialiasing);
painter.setPen(Qt::NoPen);
QList<Ripple *>::const_iterator i;