Use macro to disable theme colors in setters

components/lib/qtmaterialcheckable.cpp

@@ -179,7 +179,8 @@ void QtMaterialCheckable::setCheckedColor(const QColor &color)
     Q_D(QtMaterialCheckable);
 
     d->checkedColor = color;
-    setUseThemeColors(false);
+
+    MATERIAL_DISABLE_THEME_COLORS
     setupProperties();
 }
 
@@ -199,7 +200,8 @@ void QtMaterialCheckable::setUncheckedColor(const QColor &color)
     Q_D(QtMaterialCheckable);
 
     d->uncheckedColor = color;
-    setUseThemeColors(false);
+
+    MATERIAL_DISABLE_THEME_COLORS
     setupProperties();
 }
 
@@ -219,7 +221,8 @@ void QtMaterialCheckable::setTextColor(const QColor &color)
     Q_D(QtMaterialCheckable);
 
     d->textColor = color;
-    setUseThemeColors(false);
+
+    MATERIAL_DISABLE_THEME_COLORS
     setupProperties();
 }
 
@@ -239,7 +242,8 @@ void QtMaterialCheckable::setDisabledColor(const QColor &color)
     Q_D(QtMaterialCheckable);
 
     d->disabledColor = color;
-    setUseThemeColors(false);
+
+    MATERIAL_DISABLE_THEME_COLORS
     setupProperties();
 }
 

components/lib/qtmaterialstyle.h

@@ -4,6 +4,9 @@
 #include <QtWidgets/QCommonStyle>
 #include "lib/qtmaterialstyle_p.h"
 
+#define MATERIAL_DISABLE_THEME_COLORS \
+    if (d->useThemeColors == true) { d->useThemeColors = false; }
+
 class QtMaterialTheme;
 
 class QtMaterialStyle : public QCommonStyle

components/qtmaterialavatar.cpp

@@ -109,7 +109,8 @@ void QtMaterialAvatar::setTextColor(const QColor &color)
     Q_D(QtMaterialAvatar);
 
     d->textColor = color;
-    setUseThemeColors(false);
+
+    MATERIAL_DISABLE_THEME_COLORS
     update();
 }
 
@@ -129,7 +130,8 @@ void QtMaterialAvatar::setBackgroundColor(const QColor &color)
     Q_D(QtMaterialAvatar);
 
     d->backgroundColor = color;
-    setUseThemeColors(false);
+    
+    MATERIAL_DISABLE_THEME_COLORS
     update();
 }
 

components/qtmaterialbadge.cpp

@@ -102,7 +102,8 @@ void QtMaterialBadge::setTextColor(const QColor &color)
     Q_D(QtMaterialBadge);
 
     d->textColor = color;
-    setUseThemeColors(false);
+
+    MATERIAL_DISABLE_THEME_COLORS
     update();
 }
 
@@ -122,7 +123,8 @@ void QtMaterialBadge::setBackgroundColor(const QColor &color)
     Q_D(QtMaterialBadge);
 
     d->backgroundColor = color;
-    setUseThemeColors(false);
+
+    MATERIAL_DISABLE_THEME_COLORS
     update();
 }