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

Use DISABLE_THEME_COLORS macro

This commit is contained in:
johanneshilden 2017-09-29 21:09:22 +03:00
parent b4baf40ca1
commit dfecc15468
5 changed files with 49 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
README.md
View File

@ -19,14 +19,15 @@
- [x] Radio Button - [x] Radio Button
- [x] Raised Button - [x] Raised Button
- [ ] Scroll Bar - [ ] Scroll Bar
- [ ] Select Field
- [x] Slider - [x] Slider
- [ ] Snackbar - [ ] Snackbar
- [x] Tabs - [x] Tabs
- [x] Text Field - [x] Text Field
- [x] Toggle - [x] Toggle
#### Needs some work #### Needs some more work
- [x] Select Field
#### Not implemented #### Not implemented

8
components/qtmaterialprogress.cpp
View File

@ -95,7 +95,9 @@ void QtMaterialProgress::setProgressColor(const QColor &color)
Q_D(QtMaterialProgress); Q_D(QtMaterialProgress);
d->progressColor = color; d->progressColor = color;
setUseThemeColors(false);
MATERIAL_DISABLE_THEME_COLORS
update();
} }
QColor QtMaterialProgress::progressColor() const QColor QtMaterialProgress::progressColor() const
@ -114,7 +116,9 @@ void QtMaterialProgress::setBackgroundColor(const QColor &color)
Q_D(QtMaterialProgress); Q_D(QtMaterialProgress);
d->backgroundColor = color; d->backgroundColor = color;
setUseThemeColors(false);
MATERIAL_DISABLE_THEME_COLORS
update();
} }
QColor QtMaterialProgress::backgroundColor() const QColor QtMaterialProgress::backgroundColor() const

12
components/qtmaterialscrollbar.cpp
View File

@ -86,7 +86,9 @@ void QtMaterialScrollBar::setCanvasColor(const QColor &color)
Q_D(QtMaterialScrollBar); Q_D(QtMaterialScrollBar);
d->canvasColor = color; d->canvasColor = color;
setUseThemeColors(false);
MATERIAL_DISABLE_THEME_COLORS
update();
} }
QColor QtMaterialScrollBar::canvasColor() const QColor QtMaterialScrollBar::canvasColor() const
@ -105,7 +107,9 @@ void QtMaterialScrollBar::setBackgroundColor(const QColor &color)
Q_D(QtMaterialScrollBar); Q_D(QtMaterialScrollBar);
d->backgroundColor = color; d->backgroundColor = color;
setUseThemeColors(false);
MATERIAL_DISABLE_THEME_COLORS
update();
} }
QColor QtMaterialScrollBar::backgroundColor() const QColor QtMaterialScrollBar::backgroundColor() const
@ -124,7 +128,9 @@ void QtMaterialScrollBar::setSliderColor(const QColor &color)
Q_D(QtMaterialScrollBar); Q_D(QtMaterialScrollBar);
d->sliderColor = color; d->sliderColor = color;
setUseThemeColors(false);
MATERIAL_DISABLE_THEME_COLORS
update();
} }
QColor QtMaterialScrollBar::sliderColor() const QColor QtMaterialScrollBar::sliderColor() const

20
components/qtmaterialselectfield.cpp
View File

@ -137,7 +137,9 @@ void QtMaterialSelectField::setUnderlineColor(const QColor &color)
Q_D(QtMaterialSelectField); Q_D(QtMaterialSelectField);
d->underlineColor = color; d->underlineColor = color;
setUseThemeColors(false);
MATERIAL_DISABLE_THEME_COLORS
update();
} }
QColor QtMaterialSelectField::underlineColor() const QColor QtMaterialSelectField::underlineColor() const
@ -155,7 +157,9 @@ void QtMaterialSelectField::setPlaceholderColor(const QColor &color)
Q_D(QtMaterialSelectField); Q_D(QtMaterialSelectField);
d->placeholderColor = color; d->placeholderColor = color;
setUseThemeColors(false);
MATERIAL_DISABLE_THEME_COLORS
update();
} }
QColor QtMaterialSelectField::placeholderColor() const QColor QtMaterialSelectField::placeholderColor() const
@ -173,7 +177,9 @@ void QtMaterialSelectField::setForegroundColor(const QColor &color)
Q_D(QtMaterialSelectField); Q_D(QtMaterialSelectField);
d->foregroundColor = color; d->foregroundColor = color;
setUseThemeColors(false);
MATERIAL_DISABLE_THEME_COLORS
update();
} }
QColor QtMaterialSelectField::foregroundColor() const QColor QtMaterialSelectField::foregroundColor() const
@ -191,7 +197,9 @@ void QtMaterialSelectField::setHighlightedColor(const QColor &color)
Q_D(QtMaterialSelectField); Q_D(QtMaterialSelectField);
d->highlightedColor = color; d->highlightedColor = color;
setUseThemeColors(false);
MATERIAL_DISABLE_THEME_COLORS
update();
} }
QColor QtMaterialSelectField::highlightedColor() const QColor QtMaterialSelectField::highlightedColor() const
@ -209,7 +217,9 @@ void QtMaterialSelectField::setDisabledColor(const QColor &color)
Q_D(QtMaterialSelectField); Q_D(QtMaterialSelectField);
d->disabledColor = color; d->disabledColor = color;
setUseThemeColors(false);
MATERIAL_DISABLE_THEME_COLORS
update();
} }
QColor QtMaterialSelectField::disabledColor() const QColor QtMaterialSelectField::disabledColor() const

19
components/qtmaterialslider.cpp
View File

@ -137,6 +137,10 @@ void QtMaterialSlider::setUseThemeColors(bool value)
{ {
Q_D(QtMaterialSlider); Q_D(QtMaterialSlider);
if (d->useThemeColors == value) {
return;
}
d->useThemeColors = value; d->useThemeColors = value;
d->stateMachine->setupProperties(); d->stateMachine->setupProperties();
} }
@ -153,7 +157,10 @@ void QtMaterialSlider::setThumbColor(const QColor &color)
Q_D(QtMaterialSlider); Q_D(QtMaterialSlider);
d->thumbColor = color; d->thumbColor = color;
setUseThemeColors(false);
MATERIAL_DISABLE_THEME_COLORS
d->stateMachine->setupProperties();
update();
} }
QColor QtMaterialSlider::thumbColor() const QColor QtMaterialSlider::thumbColor() const
@ -172,7 +179,10 @@ void QtMaterialSlider::setTrackColor(const QColor &color)
Q_D(QtMaterialSlider); Q_D(QtMaterialSlider);
d->trackColor = color; d->trackColor = color;
setUseThemeColors(false);
MATERIAL_DISABLE_THEME_COLORS
d->stateMachine->setupProperties();
update();
} }
QColor QtMaterialSlider::trackColor() const QColor QtMaterialSlider::trackColor() const
@ -191,7 +201,10 @@ void QtMaterialSlider::setDisabledColor(const QColor &color)
Q_D(QtMaterialSlider); Q_D(QtMaterialSlider);
d->disabledColor = color; d->disabledColor = color;
setUseThemeColors(false);
MATERIAL_DISABLE_THEME_COLORS
d->stateMachine->setupProperties();
update();
} }
QColor QtMaterialSlider::disabledColor() const QColor QtMaterialSlider::disabledColor() const