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

rename trackGeometry and thumbGeometry to *BoundingRect

This commit is contained in:
FarmRadio Hangar 2016-05-12 12:19:00 +03:00
parent 2b99ca9f90
commit af2cb36068
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
components/slider.cpp
View File

@ -137,7 +137,7 @@ void Slider::mouseMoveEvent(QMouseEvent *event)
} }
else else
{ {
QRectF track(d->trackGeometry().adjusted(-2, -2, 2, 2)); QRectF track(d->trackBoundingRect().adjusted(-2, -2, 2, 2));
if (track.contains(event->pos()) != d->hoverTrack) { if (track.contains(event->pos()) != d->hoverTrack) {
d->hoverTrack = !d->hoverTrack; d->hoverTrack = !d->hoverTrack;
@ -145,7 +145,7 @@ void Slider::mouseMoveEvent(QMouseEvent *event)
} }
QRectF thumb(0, 0, 16, 16); QRectF thumb(0, 0, 16, 16);
thumb.moveCenter(d->thumbGeometry().center()); thumb.moveCenter(d->thumbBoundingRect().center());
if (thumb.contains(event->pos()) != d->hoverThumb) { if (thumb.contains(event->pos()) != d->hoverThumb) {
d->hoverThumb = !d->hoverThumb; d->hoverThumb = !d->hoverThumb;
@ -165,7 +165,7 @@ void Slider::mousePressEvent(QMouseEvent *event)
const QPoint pos = event->pos(); const QPoint pos = event->pos();
QRectF thumb(0, 0, 16, 16); QRectF thumb(0, 0, 16, 16);
thumb.moveCenter(d->thumbGeometry().center()); thumb.moveCenter(d->thumbBoundingRect().center());
if (thumb.contains(pos)) { if (thumb.contains(pos)) {
setSliderDown(true); setSliderDown(true);

14
components/slider_p.h
View File

@ -19,8 +19,8 @@ class SliderPrivate
public: public:
SliderPrivate(Slider *parent); SliderPrivate(Slider *parent);
QRectF trackGeometry() const; QRectF trackBoundingRect() const;
QRectF thumbGeometry() const; QRectF thumbBoundingRect() const;
void paintTrack(QPainter *painter); void paintTrack(QPainter *painter);
int valueFromPosition(const QPoint &pos) const; int valueFromPosition(const QPoint &pos) const;
@ -69,7 +69,7 @@ SliderPrivate::SliderPrivate(Slider *parent)
QCoreApplication::processEvents(); QCoreApplication::processEvents();
} }
QRectF SliderPrivate::trackGeometry() const QRectF SliderPrivate::trackBoundingRect() const
{ {
Q_Q(const Slider); Q_Q(const Slider);
@ -82,7 +82,7 @@ QRectF SliderPrivate::trackGeometry() const
q->rect().height() - SLIDER_MARGIN*2); q->rect().height() - SLIDER_MARGIN*2);
} }
QRectF SliderPrivate::thumbGeometry() const QRectF SliderPrivate::thumbBoundingRect() const
{ {
Q_Q(const Slider); Q_Q(const Slider);
@ -126,9 +126,9 @@ void SliderPrivate::paintTrack(QPainter *painter)
bool inverted = q->invertedAppearance(); bool inverted = q->invertedAppearance();
painter->fillRect(QRectF(QPointF(0, 0), box).intersected(trackGeometry()), painter->fillRect(QRectF(QPointF(0, 0), box).intersected(trackBoundingRect()),
inverted ? bg : fg); inverted ? bg : fg);
painter->fillRect(rect.intersected(trackGeometry()), inverted ? fg : bg); painter->fillRect(rect.intersected(trackBoundingRect()), inverted ? fg : bg);
painter->restore(); painter->restore();
@ -136,7 +136,7 @@ void SliderPrivate::paintTrack(QPainter *painter)
if (hoverTrack) { if (hoverTrack) {
painter->save(); painter->save();
painter->setPen(Qt::red); painter->setPen(Qt::red);
painter->drawRect(trackGeometry()); painter->drawRect(trackBoundingRect());
painter->restore(); painter->restore();
} }
#endif #endif