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

get rid of misleading trackColor property

This commit is contained in:
FarmRadio Hangar 2016-05-12 10:17:45 +03:00
parent 5a76f719b9
commit 41646d069c
4 changed files with 14 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
components/slider.cpp
View File

@ -50,21 +50,6 @@ bool Slider::pageStepMode() const
return d->pageStepMode; return d->pageStepMode;
} }
void Slider::setTrackColor(const QColor &color)
{
Q_D(Slider);
d->trackColor = color;
update();
}
QColor Slider::trackColor() const
{
Q_D(const Slider);
return d->trackColor;
}
void Slider::setTrackWidth(int width) void Slider::setTrackWidth(int width)
{ {
Q_D(Slider); Q_D(Slider);

16
components/slider.h
View File

@ -10,7 +10,6 @@ class Slider : public QAbstractSlider
{ {
Q_OBJECT Q_OBJECT
Q_PROPERTY(QColor trackColor WRITE setTrackColor READ trackColor)
Q_PROPERTY(int trackWidth WRITE setTrackWidth READ trackWidth) Q_PROPERTY(int trackWidth WRITE setTrackWidth READ trackWidth)
public: public:
@ -24,19 +23,16 @@ public:
void setPageStepMode(bool pageStep); void setPageStepMode(bool pageStep);
bool pageStepMode() const; bool pageStepMode() const;
void setTrackColor(const QColor &color);
QColor trackColor() const;
void setTrackWidth(int width); void setTrackWidth(int width);
int trackWidth() const; int trackWidth() const;
signals: signals:
void changedToMinimum(); // @TODO: create custom event void changedToMinimum(); // @TODO: create custom event type
void changedFromMinimum(); void changedFromMinimum(); // @TODO: create custom event type
void sliderEnabled(); void sliderEnabled(); //
void sliderDisabled(); void sliderDisabled(); //
void mouseEnter(); // rename/change void mouseEnter(); //
void mouseLeave(); // rename/change void mouseLeave(); //
protected: protected:
void sliderChange(SliderChange change) Q_DECL_OVERRIDE; void sliderChange(SliderChange change) Q_DECL_OVERRIDE;

24
components/slider_p.h
View File

@ -42,7 +42,6 @@ public:
int stepTo; int stepTo;
int oldValue; int oldValue;
int trackWidth; int trackWidth;
QColor trackColor;
}; };
SliderPrivate::SliderPrivate(Slider *parent) SliderPrivate::SliderPrivate(Slider *parent)
@ -84,22 +83,13 @@ void SliderPrivate::init(Slider *slider)
pulseOutState->assignProperty(thumb, "haloSize", 35); pulseOutState->assignProperty(thumb, "haloSize", 35);
pulseInState->assignProperty(thumb, "haloSize", 28); pulseInState->assignProperty(thumb, "haloSize", 28);
QColor disabledColor = style.themeColor("disabled");
disabledState->assignProperty(thumb, "diameter", 7); disabledState->assignProperty(thumb, "diameter", 7);
disabledState->assignProperty(thumb, "fillColor", disabledColor); disabledState->assignProperty(thumb, "fillColor", style.themeColor("disabled"));
disabledState->assignProperty(slider, "trackColor", disabledColor);
inactiveState->assignProperty(thumb, "diameter", 11); inactiveState->assignProperty(thumb, "diameter", 11);
focusState->assignProperty(thumb, "diameter", 11); focusState->assignProperty(thumb, "diameter", 11);
slidingState->assignProperty(thumb, "diameter", 17); slidingState->assignProperty(thumb, "diameter", 17);
QColor trackColor = style.themeColor("accent3");
inactiveState->assignProperty(slider, "trackColor", trackColor);
focusState->assignProperty(slider, "trackColor", trackColor);
slidingState->assignProperty(slider, "trackColor", trackColor);
QColor fillColor = style.themeColor("primary1"); QColor fillColor = style.themeColor("primary1");
inactiveState->assignProperty(thumb, "fillColor", fillColor); inactiveState->assignProperty(thumb, "fillColor", fillColor);
@ -320,18 +310,18 @@ void SliderPrivate::paintTrack(QPainter *painter)
{ {
Q_Q(const Slider); Q_Q(const Slider);
Style &style = Style::instance();
painter->save(); painter->save();
QBrush fg; QBrush fg;
fg.setStyle(Qt::SolidPattern); fg.setStyle(Qt::SolidPattern);
fg.setColor(q->isEnabled() ? Style::instance().themeColor("primary1") fg.setColor(q->isEnabled() ? style.themeColor("primary1")
: trackColor); : style.themeColor("disabled"));
// @TODO -- clean up this
QBrush bg; QBrush bg;
bg.setStyle(Qt::SolidPattern); bg.setStyle(Qt::SolidPattern);
bg.setColor(hover ? QColor(0, 0, 0, 150) bg.setColor(hover ? QColor(0, 0, 0, 150) // @TODO: set theme color
: trackColor); : style.themeColor("accent3"));
qreal offset = q->thumbOffset() + SLIDER_MARGIN; qreal offset = q->thumbOffset() + SLIDER_MARGIN;

2
components/sliderthumb.cpp
View File

@ -64,7 +64,7 @@ void SliderThumb::paintEvent(QPaintEvent *event)
if (_borderWidth > 0) { if (_borderWidth > 0) {
QPen pen; QPen pen;
pen.setColor(slider->trackColor()); pen.setColor(Style::instance().themeColor("accent3"));
pen.setWidthF(_borderWidth); pen.setWidthF(_borderWidth);
painter.setPen(pen); painter.setPen(pen);
} else { } else {