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

simplify code

This commit is contained in:
laserpants 2016-03-25 23:37:59 +03:00
parent 9440519bc8
commit db1c8ddee4
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
components/slider.cpp
View File

@ -44,7 +44,7 @@ void Handle::mousePressEvent(QMouseEvent *event)
void Handle::mouseMoveEvent(QMouseEvent *event) void Handle::mouseMoveEvent(QMouseEvent *event)
{ {
setPosition(_offset + event->globalPos()); setRelativePosition(event->globalPos());
} }
Slider::Slider(QWidget *parent) Slider::Slider(QWidget *parent)
@ -85,9 +85,12 @@ void Slider::mousePressEvent(QMouseEvent *event)
{ {
const QSize s = _handle->sizeHint(); const QSize s = _handle->sizeHint();
const QPoint p = event->pos(); const QPoint p = event->pos();
const QPoint newPos = p - QPoint(s.width()/2, s.height()/2);
if (Qt::Horizontal == _orientation ? touchesRail(p.y(), height()/2) : touchesRail(p.x(), width()/2)) { if (Qt::Horizontal == _orientation
? touchesRail(p.y(), height()/2)
: touchesRail(p.x(), width()/2))
{
const QPoint newPos = p - QPoint(s.width()/2, s.height()/2);
_handle->setPosition(newPos); _handle->setPosition(newPos);
_handle->setOffset(newPos - event->globalPos()); _handle->setOffset(newPos - event->globalPos());
_drag = true; _drag = true;
@ -100,7 +103,7 @@ void Slider::mousePressEvent(QMouseEvent *event)
void Slider::mouseMoveEvent(QMouseEvent *event) void Slider::mouseMoveEvent(QMouseEvent *event)
{ {
if (_drag) { if (_drag) {
_handle->setPosition(_handle->offset() + event->globalPos()); _handle->setRelativePosition(event->globalPos());
} }
QWidget::mouseMoveEvent(event); QWidget::mouseMoveEvent(event);
} }
@ -116,4 +119,3 @@ bool Slider::touchesRail(int p, int x) const
{ {
return (p >= x-2 && p < x+2); return (p >= x-2 && p < x+2);
} }

5
components/slider.h
View File

@ -15,10 +15,15 @@ public:
~Handle(); ~Handle();
inline QSize sizeHint() const { return QSize(16, 16); } inline QSize sizeHint() const { return QSize(16, 16); }
inline void setRelativePosition(const QPoint &pos) { setPosition(_offset + pos); }
inline void setPosition(const QPoint &pos) { _position = pos; refreshGeometry(); } inline void setPosition(const QPoint &pos) { _position = pos; refreshGeometry(); }
inline const QPoint &position() const { return _position; } inline const QPoint &position() const { return _position; }
inline void setOffset(const QPoint &offset) { _offset = offset; update(); } inline void setOffset(const QPoint &offset) { _offset = offset; update(); }
inline const QPoint &offset() const { return _offset; } inline const QPoint &offset() const { return _offset; }
void refreshGeometry(); void refreshGeometry();
protected: protected: