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

snapshot

This commit is contained in:
laserpants 2016-05-10 09:25:44 +03:00
parent d881c4c898
commit e19f8b4fa4
5 changed files with 164 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/slider.cpp
View File

@ -20,8 +20,6 @@ Slider::Slider(QWidget *parent)
sp.transpose();
setSizePolicy(sp);
setAttribute(Qt::WA_WState_OwnSizePolicy, false);
// connect(this, SIGNAL(actionTriggered(int)), this, SLOT(handleAction(int)));
}
Slider::~Slider()

115
components/slider_p.h
View File

@ -2,7 +2,6 @@
// inverse mode
// paint track differently left of thumb
// direct click mode (mode thumb to click pos)
// paint thumb in halo widget
#ifndef SLIDER_P_H
#define SLIDER_P_H
@ -14,98 +13,21 @@
#include <QSignalTransition>
#include <QDebug>
#include "lib/style.h"
#include "sliderthumb.h"
#define THUMB_OUTER_SIZE 20
class Halo : public QWidget
{
Q_OBJECT
Q_PROPERTY(qreal size WRITE setSize READ size)
public:
Halo(Slider *slider)
: QWidget(slider->parentWidget()),
slider(slider),
_size(0)
{
slider->installEventFilter(this);
setAttribute(Qt::WA_TransparentForMouseEvents, true);
connect(slider, SIGNAL(sliderMoved(int)), this, SLOT(update()));
connect(slider, SIGNAL(valueChanged(int)), this, SLOT(update()));
}
~Halo()
{
}
inline void setSize(qreal size)
{
_size = size;
update();
}
inline qreal size() const { return _size; }
protected:
bool eventFilter(QObject *obj, QEvent *event)
{
if (QEvent::ParentChange == event->type()) {
setParent(slider->parentWidget());
}
return QWidget::eventFilter(obj, event);
}
void paintEvent(QPaintEvent *event)
{
QPainter painter(this);
QBrush brush;
brush.setStyle(Qt::SolidPattern);
brush.setColor(QColor(0, 0, 0, 20));
painter.setBrush(brush);
painter.setPen(Qt::NoPen);
painter.setRenderHint(QPainter::Antialiasing);
QPointF disp = Qt::Horizontal == slider->orientation()
? QPointF(THUMB_OUTER_SIZE/2 + slider->thumbOffset(),
slider->height()/2)
: QPointF(slider->width()/2,
THUMB_OUTER_SIZE/2 + slider->thumbOffset());
QRectF halo((slider->pos() - QPointF(_size, _size)/2) + disp,
QSize(_size, _size));
painter.drawEllipse(halo);
#ifdef DEBUG_LAYOUT
QPen pen;
pen.setColor(Qt::red);
pen.setWidth(2);
painter.setPen(pen);
painter.setBrush(Qt::NoBrush);
painter.drawRect(rect().adjusted(0, 0, -2, -2));
#endif
QWidget::paintEvent(event);
}
private:
const Slider *const slider;
qreal _size;
};
class SliderPrivate
{
Q_DISABLE_COPY(SliderPrivate)
Q_DECLARE_PUBLIC(Slider)
friend class SliderThumb;
public:
SliderPrivate(Slider *parent)
: q_ptr(parent),
halo(new Halo(parent)),
thumb(new SliderThumb(this)),
hoverTrack(false),
hoverThumb(false),
step(false),
@ -132,10 +54,10 @@ public:
focusState->setInitialState(pulseState);
inactiveState->assignProperty(halo, "size", 0);
pulseState->assignProperty(halo, "size", 35);
pulse2State->assignProperty(halo, "size", 28);
downState->assignProperty(halo, "size", 0);
inactiveState->assignProperty(thumb, "haloSize", 0);
pulseState->assignProperty(thumb, "haloSize", 35);
pulse2State->assignProperty(thumb, "haloSize", 28);
downState->assignProperty(thumb, "haloSize", 0);
inactiveState->assignProperty(slider, "thumbSize", 11);
focusState->assignProperty(slider, "thumbSize", 11);
@ -161,7 +83,7 @@ public:
transition = new QEventTransition(slider, QEvent::FocusIn);
transition->setTargetState(focusState);
animation = new QPropertyAnimation(halo, "size");
animation = new QPropertyAnimation(thumb, "haloSize");
transition->addAnimation(animation);
inactiveState->addTransition(transition);
@ -170,7 +92,7 @@ public:
transition = new QEventTransition(slider, QEvent::FocusOut);
transition->setTargetState(inactiveState);
animation = new QPropertyAnimation(halo, "size");
animation = new QPropertyAnimation(thumb, "haloSize");
transition->addAnimation(animation);
focusState->addTransition(transition);
@ -179,7 +101,7 @@ public:
transition = new QSignalTransition(pulseState, SIGNAL(propertiesAssigned()));
transition->setTargetState(pulse2State);
animation = new QPropertyAnimation(halo, "size");
animation = new QPropertyAnimation(thumb, "haloSize");
animation->setEasingCurve(QEasingCurve::InOutSine);
animation->setDuration(1000);
transition->addAnimation(animation);
@ -190,7 +112,7 @@ public:
transition = new QSignalTransition(pulse2State, SIGNAL(propertiesAssigned()));
transition->setTargetState(pulseState);
animation = new QPropertyAnimation(halo, "size");
animation = new QPropertyAnimation(thumb, "haloSize");
animation->setEasingCurve(QEasingCurve::InOutSine);
animation->setDuration(1000);
transition->addAnimation(animation);
@ -201,7 +123,7 @@ public:
transition = new QSignalTransition(slider, SIGNAL(sliderPressed()));
transition->setTargetState(downState);
transition->addAnimation(new QPropertyAnimation(slider, "thumbSize"));
transition->addAnimation(new QPropertyAnimation(halo, "size"));
transition->addAnimation(new QPropertyAnimation(thumb, "haloSize"));
focusState->addTransition(transition);
// Slider released
@ -209,7 +131,7 @@ public:
transition = new QSignalTransition(slider, SIGNAL(sliderReleased()));
transition->setTargetState(focusState);
transition->addAnimation(new QPropertyAnimation(slider, "thumbSize"));
transition->addAnimation(new QPropertyAnimation(halo, "size"));
transition->addAnimation(new QPropertyAnimation(thumb, "haloSize"));
downState->addTransition(transition);
//
@ -287,6 +209,9 @@ public:
#endif
}
// remove
// remove
// remove
QRectF thumbGeometry() const
{
Q_Q(const Slider);
@ -298,6 +223,8 @@ public:
THUMB_OUTER_SIZE, THUMB_OUTER_SIZE);
}
// remove
// remove
void paintThumb(QPainter *painter)
{
painter->drawRect(thumbGeometry().adjusted(0, 0, -1, -1));
@ -359,14 +286,14 @@ public:
}
Slider *const q_ptr;
Halo *const halo;
SliderThumb *const thumb;
QStateMachine machine;
bool hoverTrack;
bool hoverThumb;
bool step;
int stepTo;
int oldValue;
qreal thumbSize;
qreal thumbSize; // move VVV
qreal thumbPenWidth;
QColor thumbColor;
};

98
components/sliderthumb.cpp Normal file
View File

@ -0,0 +1,98 @@
#include "sliderthumb.h"
#include "slider_p.h"
SliderThumb::SliderThumb(SliderPrivate *slider)
: QWidget(slider->q_func()),
slider(slider),
_haloSize(0)
{
Slider *parent = slider->q_func();
parent->installEventFilter(this);
setAttribute(Qt::WA_TransparentForMouseEvents, true);
connect(parent, SIGNAL(sliderMoved(int)), this, SLOT(update()));
connect(parent, SIGNAL(valueChanged(int)), this, SLOT(update()));
}
SliderThumb::~SliderThumb()
{
}
bool SliderThumb::eventFilter(QObject *obj, QEvent *event)
{
if (QEvent::ParentChange == event->type()) {
setParent(slider->q_func()->parentWidget());
}
return QWidget::eventFilter(obj, event);
}
void SliderThumb::paintEvent(QPaintEvent *event)
{
Slider *const q = slider->q_func();
QPainter painter(this);
// Halo
QBrush brush;
brush.setStyle(Qt::SolidPattern);
brush.setColor(QColor(0, 0, 0, 20));
painter.setBrush(brush);
painter.setPen(Qt::NoPen);
painter.setRenderHint(QPainter::Antialiasing);
QPointF disp = Qt::Horizontal == q->orientation()
? QPointF(THUMB_OUTER_SIZE/2 + q->thumbOffset(),
q->height()/2)
: QPointF(q->width()/2,
THUMB_OUTER_SIZE/2 + q->thumbOffset());
QRectF halo((q->pos() - QPointF(_haloSize, _haloSize)/2) + disp,
QSize(_haloSize, _haloSize));
painter.drawEllipse(halo);
// Knob
brush.setStyle(Qt::SolidPattern);
brush.setColor(slider->thumbColor);
painter.setBrush(brush);
if (slider->thumbPenWidth > 0) {
QPen pen;
pen.setWidthF(slider->thumbPenWidth);
painter.setPen(pen);
} else {
painter.setPen(Qt::NoPen);
}
QRectF thumb(0, 0, slider->thumbSize, slider->thumbSize);
thumb.moveCenter(thumbGeometry().center());
painter.drawEllipse(thumb);
#ifdef DEBUG_LAYOUT
QPen pen;
pen.setColor(Qt::red);
pen.setWidth(2);
painter.setPen(pen);
painter.setBrush(Qt::NoBrush);
painter.drawRect(rect().adjusted(0, 0, -2, -2));
#endif
QWidget::paintEvent(event);
}
QRectF SliderThumb::thumbGeometry() const
{
const Slider *const q = slider->q_func();
return Qt::Horizontal == q->orientation()
? QRectF(q->thumbOffset(), q->rect().height()/2 - THUMB_OUTER_SIZE/2,
THUMB_OUTER_SIZE, THUMB_OUTER_SIZE)
: QRectF(q->rect().width()/2 - THUMB_OUTER_SIZE/2, q->thumbOffset(),
THUMB_OUTER_SIZE, THUMB_OUTER_SIZE);
}

41
components/sliderthumb.h Normal file
View File

@ -0,0 +1,41 @@
#ifndef SLIDERTHUMB_H
#define SLIDERTHUMB_H
#include <QWidget>
class SliderPrivate;
class SliderThumb : public QWidget
{
Q_OBJECT
Q_PROPERTY(qreal haloSize WRITE setHaloSize READ haloSize)
friend class SliderPrivate;
explicit SliderThumb(SliderPrivate *slider);
public:
~SliderThumb();
inline void setHaloSize(qreal size)
{
_haloSize = size;
update();
}
inline qreal haloSize() const { return _haloSize; }
protected:
bool eventFilter(QObject *obj, QEvent *event);
void paintEvent(QPaintEvent *event);
private:
Q_DISABLE_COPY(SliderThumb)
QRectF thumbGeometry() const;
SliderPrivate *const slider;
qreal _haloSize;
};
#endif // SLIDERTHUMB_H

6
qt-material-widgets.pro
View File

@ -50,7 +50,8 @@ SOURCES += main.cpp\
components/scrollbar.cpp \
examples/iconmenuexamples.cpp \
lib/scaleeffect.cpp \
lib/style.cpp
lib/style.cpp \
components/sliderthumb.cpp
HEADERS += mainwindow.h \
components/appbar.h \
@ -95,7 +96,8 @@ HEADERS += mainwindow.h \
components/scrollbar.h \
examples/iconmenuexamples.h \
lib/scaleeffect.h \
lib/style.h
lib/style.h \
components/sliderthumb.h
RESOURCES += \
resources.qrc