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

implement Slider halo animation

This commit is contained in:
laserpants 2016-05-01 15:13:37 +03:00
parent 9b47d76d02
commit 48f5055d4e
2 changed files with 102 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

192
components/slider.cpp
View File

@ -7,7 +7,8 @@
Handle::Handle(Slider *slider) Handle::Handle(Slider *slider)
: QWidget(slider), : QWidget(slider),
_slider(slider), _slider(slider),
_knobSize(12) _knobSize(12),
_haloSize(0)
{ {
setAttribute(Qt::WA_TransparentForMouseEvents); setAttribute(Qt::WA_TransparentForMouseEvents);
} }
@ -18,16 +19,10 @@ Handle::~Handle()
void Handle::refreshGeometry() void Handle::refreshGeometry()
{ {
//QWidget *container = parentWidget(); const QSize handle = sizeHint();
//Slider *container = _slider;
const QSize s = sizeHint();
setGeometry(QRect(_slider->orientation() == Qt::Horizontal setGeometry(QRect(_slider->orientation() == Qt::Horizontal
? QPoint(qBound(0, _position.x(), _slider->width()-s.width()), _slider->height()/2-s.height()/2) ? QPoint(qBound(0, _position.x(), _slider->width()-handle.width()), _slider->height()/2-handle.height()/2)
: QPoint(_slider->width()/2-s.width()/2, qBound(0, _position.y(), _slider->height()-s.height())), s)); : QPoint(_slider->width()/2-handle.width()/2, qBound(0, _position.y(), _slider->height()-handle.height())), handle));
// ? QPoint(qBound(0, _position.x(), container->width()-s.width()), container->height()/2-s.height()/2)
// : QPoint(container->width()/2-s.width()/2, qBound(0, _position.y(), container->height()-s.height())), s));
update(); update();
} }
@ -36,75 +31,43 @@ void Handle::paintEvent(QPaintEvent *event)
QPainter painter(this); QPainter painter(this);
painter.setRenderHint(QPainter::Antialiasing); painter.setRenderHint(QPainter::Antialiasing);
// QPen pen; //painter.drawRect(rect());
// pen.setColor(Qt::black);
// pen.setWidth(1);
// painter.setPen(pen);
// painter.drawRect(rect().adjusted(0, 0, -1, -1));
QBrush brush; QBrush brush;
brush.setColor(QColor(0, 0, 0)); brush.setColor(QColor(0, 0, 0));
brush.setStyle(Qt::SolidPattern); brush.setStyle(Qt::SolidPattern);
// painter.drawRect(rect());
painter.setBrush(brush); painter.setBrush(brush);
painter.setPen(Qt::NoPen); painter.setPen(Qt::NoPen);
//painter.drawEllipse(0, 0, width(), height());
painter.drawEllipse((width()-_knobSize)/2, (height()-_knobSize)/2, _knobSize, _knobSize); painter.drawEllipse((width()-_knobSize)/2, (height()-_knobSize)/2, _knobSize, _knobSize);
painter.setOpacity(0.2);
painter.drawEllipse((width()-_haloSize)/2, (height()-_haloSize)/2, _haloSize, _haloSize);
QWidget::paintEvent(event); QWidget::paintEvent(event);
} }
/*
void Handle::mousePressEvent(QMouseEvent *event)
{
_offset = pos() - event->globalPos();
_animation->setDirection(QAbstractAnimation::Forward);
_animation->start();
}
void Handle::mouseReleaseEvent(QMouseEvent *event)
{
Q_UNUSED(event)
_animation->setDirection(QAbstractAnimation::Backward);
_animation->start();
}
*/
//void Handle::enterEvent(QEvent *event)
//{
// _slider->update();
//}
//
//void Handle::leaveEvent(QEvent *event)
//{
// _slider->update();
//}
//void Handle::mouseMoveEvent(QMouseEvent *event)
//{
// setRelativePosition(event->globalPos());
// //_slider->update();
// _slider->updateValue();
//}
Slider::Slider(QWidget *parent) Slider::Slider(QWidget *parent)
: QAbstractSlider(parent), : QAbstractSlider(parent),
_animation(new QPropertyAnimation(this)), _knobAnimation(new QPropertyAnimation(this)),
_haloAnimation(new QPropertyAnimation(this)),
_handle(new Handle(this)),
_drag(false), _drag(false),
_hover(false), _hover(false),
_handle(new Handle(this)),
_orientation(Qt::Horizontal) _orientation(Qt::Horizontal)
{ {
_animation->setPropertyName("knobSize"); _knobAnimation->setPropertyName("knobSize");
_animation->setTargetObject(_handle); _knobAnimation->setTargetObject(_handle);
_animation->setStartValue(12); _knobAnimation->setStartValue(12);
_animation->setEndValue(20); _knobAnimation->setEndValue(20);
_animation->setDuration(100); _knobAnimation->setDuration(100);
_haloAnimation->setPropertyName("haloSize");
_haloAnimation->setTargetObject(_handle);
_haloAnimation->setStartValue(12);
_haloAnimation->setEndValue(30);
_haloAnimation->setDuration(200);
setMouseTracking(true); setMouseTracking(true);
} }
@ -121,47 +84,50 @@ void Slider::paintEvent(QPaintEvent *event)
? QRect(width()/2-1, 0, 2, height()) ? QRect(width()/2-1, 0, 2, height())
: QRect(0, height()/2-1, width(), 2); : QRect(0, height()/2-1, width(), 2);
const QSize s = _handle->sizeHint(); const QSize handle = _handle->sizeHint();
QBrush brush; QBrush brush;
brush.setStyle(Qt::SolidPattern); brush.setStyle(Qt::SolidPattern);
brush.setColor(QColor(0, 0, 0, 40)); brush.setColor(_hover ? QColor(0, 0, 0, 80) : QColor(0, 0, 0, 40));
if (Qt::Horizontal == _orientation) { if (Qt::Horizontal == _orientation) {
r.adjust(s.width()/2, 0, -s.width()/2, 0); r.adjust(handle.width()/2, 0, -handle.width()/2, 0);
} else { } else {
r.adjust(0, s.height()/2, 0, -s.height()/2); r.adjust(0, handle.height()/2, 0, -handle.height()/2);
} }
painter.fillRect(r, brush); painter.fillRect(r, brush);
painter.save(); painter.save();
brush.setColor(QColor(0, 0, 0)); brush.setColor(QColor(0, 0, 0));
const QPoint range = Qt::Vertical == _orientation
const QPoint p = Qt::Vertical == _orientation ? QPoint(width(), _handle->y()+handle.height()/2)
? QPoint(width(), _handle->y()+s.height()/2) : QPoint(_handle->x()+handle.width()/2, height());
: QPoint(_handle->x()+s.width()/2, height()); painter.fillRect(r.intersected(QRect(QPoint(0, 0), range)), brush);
painter.fillRect(r.intersected(QRect(QPoint(0, 0), p)), brush);
painter.restore(); painter.restore();
if (_hover) {
painter.drawRect(rect().adjusted(0, 0, -1, -1));
}
QAbstractSlider::paintEvent(event); QAbstractSlider::paintEvent(event);
} }
void Slider::mousePressEvent(QMouseEvent *event) void Slider::mousePressEvent(QMouseEvent *event)
{ {
const QSize s = _handle->sizeHint(); const QPoint pos = event->pos();
_handle->setOffset((event->pos() - QPoint(s.width(), s.height())/2) - event->globalPos()); const bool oh = overHandle(pos);
if (overHandle(event->pos())) { if (oh || overTrack(pos)) {
_drag = true; const QSize handle = _handle->sizeHint();
_animation->setDirection(QAbstractAnimation::Forward); _handle->setOffset((pos - QPoint(handle.width(), handle.height())/2) - event->globalPos());
_animation->start();
} else if (overTrack(event->pos())) {
_handle->setRelativePosition(event->globalPos()); _handle->setRelativePosition(event->globalPos());
_drag = true;
_knobAnimation->setDirection(QAbstractAnimation::Forward);
_knobAnimation->start();
if (oh) {
_haloAnimation->setDirection(QAbstractAnimation::Backward);
_haloAnimation->start();
} else {
_haloAnimation->stop();
_handle->setHaloSize(0);
}
updateValue(); updateValue();
} }
QAbstractSlider::mousePressEvent(event); QAbstractSlider::mousePressEvent(event);
@ -173,8 +139,10 @@ void Slider::mouseReleaseEvent(QMouseEvent *event)
if (_drag) { if (_drag) {
_drag = false; _drag = false;
_animation->setDirection(QAbstractAnimation::Backward); _hover = false;
_animation->start(); _knobAnimation->setDirection(QAbstractAnimation::Backward);
_knobAnimation->start();
updateHoverState(mapFromGlobal(QCursor::pos()));
} }
} }
@ -200,10 +168,7 @@ void Slider::leaveEvent(QEvent *event)
{ {
Q_UNUSED(event) Q_UNUSED(event)
if (_hover) { endHover();
_hover = false;
update();
}
} }
void Slider::resizeEvent(QResizeEvent *event) void Slider::resizeEvent(QResizeEvent *event)
@ -215,23 +180,22 @@ void Slider::resizeEvent(QResizeEvent *event)
bool Slider::overTrack(const QPoint &pos) const bool Slider::overTrack(const QPoint &pos) const
{ {
if (Qt::Horizontal == _orientation) { if (Qt::Horizontal == _orientation) {
const int y = pos.y(); const int handleW = _handle->width();
const int h = height()/2; return QRect(handleW/2, height()/2-4, width()-handleW, 8).contains(pos);
return (y >= h-2 && y <= h+2);
} else { } else {
const int x = pos.x(); const int handleH = _handle->height();
const int w = width()/2; return QRect(width()/2-4, handleH/2, 8, height()-handleH).contains(pos);
return (x >= w-2 && x <= w+2);
} }
} }
bool Slider::overHandle(const QPoint &pos) const bool Slider::overHandle(const QPoint &pos) const
{ {
const int knob = _handle->knobSize(); const int knob = _handle->knobSize();
const int hl = _handle->x() + (20-knob)/2; const int hl = _handle->x() + (20-knob)/2; // @TODO: 20 should not be hard coded
const int ht = _handle->y() + (20-knob)/2; const int ht = _handle->y() + (20-knob)/2; // @TODO: 20 should not be hard coded
return (pos.x() >= hl && pos.x() <= hl+knob && pos.y() >= ht && pos.y() <= ht+knob); return (pos.x() > hl - 10 && pos.x() < hl+knob + 10
&& pos.y() > ht - 10 && pos.y() < ht+knob + 10);
} }
void Slider::updateValue() void Slider::updateValue()
@ -244,27 +208,39 @@ void Slider::updateValue()
? _handle->geometry().left() / tot ? _handle->geometry().left() / tot
: _handle->geometry().top() / tot; : _handle->geometry().top() / tot;
// use QStyle::sliderValueFromPosition ?? // @TODO: use QStyle::sliderValueFromPosition()
setValue((1-r)*minimum()+r*maximum()); setValue((1-r)*minimum()+r*maximum());
//setSliderPosition((1-r)*minimum()+r*maximum());
//triggerAction(QAbstractSlider::SliderMove);
update(); update();
} }
void Slider::updateHoverState(const QPoint &pos) void Slider::updateHoverState(const QPoint &pos)
{ {
if (overTrack(pos) || (overHandle(pos))) { if (overTrack(pos) || (overHandle(pos))) {
if (!_hover) { beginHover();
_hover = true;
update();
}
} else { } else {
if (_hover) { endHover();
_hover = false; }
update(); }
}
void Slider::beginHover() {
if (!_hover) {
_hover = true;
_haloAnimation->setDirection(QAbstractAnimation::Forward);
_haloAnimation->start();
update();
}
}
void Slider::endHover()
{
if (_hover) {
_hover = false;
if (_handle->haloSize() > 12) {
_haloAnimation->setDirection(QAbstractAnimation::Backward);
_haloAnimation->start();
}
update();
} }
} }

33
components/slider.h
View File

@ -4,7 +4,6 @@
#include <QAbstractSlider> #include <QAbstractSlider>
#include <QPoint> #include <QPoint>
class QPropertyAnimation;
class Slider; class Slider;
class Handle : public QWidget class Handle : public QWidget
@ -12,12 +11,13 @@ class Handle : public QWidget
Q_OBJECT Q_OBJECT
Q_PROPERTY(qreal knobSize WRITE setKnobSize READ knobSize) Q_PROPERTY(qreal knobSize WRITE setKnobSize READ knobSize)
Q_PROPERTY(qreal haloSize WRITE setHaloSize READ haloSize)
public: public:
explicit Handle(Slider *slider); explicit Handle(Slider *slider);
~Handle(); ~Handle();
inline QSize sizeHint() const Q_DECL_OVERRIDE { return QSize(20, 20); } inline QSize sizeHint() const Q_DECL_OVERRIDE { return QSize(30, 30); }
inline void setRelativePosition(const QPoint &pos) { setPosition(_offset + pos); } inline void setRelativePosition(const QPoint &pos) { setPosition(_offset + pos); }
@ -30,15 +30,13 @@ public:
inline void setKnobSize (qreal size ) { _knobSize = size; refreshGeometry(); } inline void setKnobSize (qreal size ) { _knobSize = size; refreshGeometry(); }
inline qreal knobSize() const { return _knobSize; } inline qreal knobSize() const { return _knobSize; }
inline void setHaloSize (qreal size ) { _haloSize = size; update(); }
inline qreal haloSize() const { return _haloSize; }
void refreshGeometry(); void refreshGeometry();
protected: protected:
void paintEvent(QPaintEvent *event) Q_DECL_OVERRIDE; void paintEvent(QPaintEvent *event) Q_DECL_OVERRIDE;
// void mousePressEvent(QMouseEvent *event) Q_DECL_OVERRIDE;
// void mouseReleaseEvent(QMouseEvent *event) Q_DECL_OVERRIDE;
// void enterEvent(QEvent *event) Q_DECL_OVERRIDE;
// void leaveEvent(QEvent *event) Q_DECL_OVERRIDE;
// void mouseMoveEvent(QMouseEvent *event) Q_DECL_OVERRIDE;
private: private:
Slider *const _slider; Slider *const _slider;
@ -46,8 +44,11 @@ private:
QPoint _eventPos; QPoint _eventPos;
QPoint _offset; QPoint _offset;
qreal _knobSize; qreal _knobSize;
qreal _haloSize;
}; };
class QPropertyAnimation;
class Slider : public QAbstractSlider class Slider : public QAbstractSlider
{ {
Q_OBJECT Q_OBJECT
@ -68,20 +69,22 @@ protected:
void leaveEvent(QEvent *event) Q_DECL_OVERRIDE; void leaveEvent(QEvent *event) Q_DECL_OVERRIDE;
void resizeEvent(QResizeEvent *event) Q_DECL_OVERRIDE; void resizeEvent(QResizeEvent *event) Q_DECL_OVERRIDE;
private:
friend class Handle;
bool overTrack(const QPoint &pos) const; bool overTrack(const QPoint &pos) const;
bool overHandle(const QPoint &pos) const; bool overHandle(const QPoint &pos) const;
void updateValue(); void updateValue();
void updateHoverState(const QPoint &pos); void updateHoverState(const QPoint &pos);
QPropertyAnimation *const _animation; void beginHover();
bool _drag; void endHover();
bool _hover;
Handle *const _handle; private:
Qt::Orientation _orientation; QPropertyAnimation *const _knobAnimation;
QPropertyAnimation *const _haloAnimation;
Handle *const _handle;
bool _drag;
bool _hover;
Qt::Orientation _orientation;
}; };
#endif // SLIDER_H #endif // SLIDER_H