diff --git a/components/qtmaterialtabs.h b/components/qtmaterialtabs.h index a4f3be3..750af84 100644 --- a/components/qtmaterialtabs.h +++ b/components/qtmaterialtabs.h @@ -12,6 +12,11 @@ class QtMaterialTab; class QT_MATERIAL_EXPORT QtMaterialTabs : public QWidget { Q_OBJECT + Q_PROPERTY(bool haloVisible WRITE setHaloVisible READ isHaloVisible) + Q_PROPERTY(MaterialConst::RippleStyle rippleStyle WRITE setRippleStyle READ rippleStyle) + Q_PROPERTY(QColor inkColor WRITE setInkColor READ inkColor) + Q_PROPERTY(QColor backgroundColor WRITE setBackgroundColor READ backgroundColor) + Q_PROPERTY(QColor textColor WRITE setTextColor READ textColor) public: explicit QtMaterialTabs(QWidget *parent = 0); diff --git a/components/qtmaterialtabwidget.cpp b/components/qtmaterialtabwidget.cpp index 3ef83d3..4485d27 100644 --- a/components/qtmaterialtabwidget.cpp +++ b/components/qtmaterialtabwidget.cpp @@ -9,6 +9,7 @@ QtMaterialTabWidget::QtMaterialTabWidget(QWidget *parent) , stackWidget(new QStackedWidget) { tabBar->setObjectName(QStringLiteral("__qt__passive_tabBar")); + tabBar->setHaloVisible(false); connect(tabBar, QOverload::of(&QtMaterialTabs::currentChanged), this, &QtMaterialTabWidget::setCurrentIndex); @@ -18,6 +19,56 @@ QtMaterialTabWidget::QtMaterialTabWidget(QWidget *parent) layout->addWidget(stackWidget); } +void QtMaterialTabWidget::setHaloVisible(bool value) +{ + tabBar->setHaloVisible(value); +} + +bool QtMaterialTabWidget::isHaloVisible() const +{ + return tabBar->isHaloVisible(); +} + +void QtMaterialTabWidget::setRippleStyle(MaterialConst::RippleStyle style) +{ + tabBar->setRippleStyle(style); +} + +MaterialConst::RippleStyle QtMaterialTabWidget::rippleStyle() const +{ + return tabBar->rippleStyle(); +} + +void QtMaterialTabWidget::setInkColor(const QColor &color) +{ + tabBar->setInkColor(color); +} + +QColor QtMaterialTabWidget::inkColor() const +{ + return tabBar->inkColor(); +} + +void QtMaterialTabWidget::setBackgroundColor(const QColor &color) +{ + tabBar->setBackgroundColor(color); +} + +QColor QtMaterialTabWidget::backgroundColor() const +{ + return tabBar->backgroundColor(); +} + +void QtMaterialTabWidget::setTextColor(const QColor &color) +{ + tabBar->setTextColor(color); +} + +QColor QtMaterialTabWidget::textColor() const +{ + return tabBar->textColor(); +} + QSize QtMaterialTabWidget::sizeHint() const { return QSize(300, 200); diff --git a/components/qtmaterialtabwidget.h b/components/qtmaterialtabwidget.h index 1aea123..8783b36 100644 --- a/components/qtmaterialtabwidget.h +++ b/components/qtmaterialtabwidget.h @@ -3,6 +3,7 @@ #include #include "qtmaterial_global.h" +#include "lib/qtmaterialtheme.h" QT_BEGIN_NAMESPACE class QStackedWidget; @@ -14,12 +15,31 @@ class QT_MATERIAL_EXPORT QtMaterialTabWidget : public QWidget Q_OBJECT Q_PROPERTY(int currentIndex READ currentIndex WRITE setCurrentIndex) Q_PROPERTY(QString pageTitle READ pageTitle WRITE setPageTitle STORED false) + Q_PROPERTY(bool haloVisible WRITE setHaloVisible READ isHaloVisible) + Q_PROPERTY(MaterialConst::RippleStyle rippleStyle WRITE setRippleStyle READ rippleStyle) + Q_PROPERTY(QColor inkColor WRITE setInkColor READ inkColor) + Q_PROPERTY(QColor backgroundColor WRITE setBackgroundColor READ backgroundColor) + Q_PROPERTY(QColor textColor WRITE setTextColor READ textColor) public: explicit QtMaterialTabWidget(QWidget *parent = nullptr); - QSize sizeHint() const override; + void setHaloVisible(bool value); + bool isHaloVisible() const; + void setRippleStyle(MaterialConst::RippleStyle style); + MaterialConst::RippleStyle rippleStyle() const; + + void setInkColor(const QColor &color); + QColor inkColor() const; + + void setBackgroundColor(const QColor &color); + QColor backgroundColor() const; + + void setTextColor(const QColor &color); + QColor textColor() const; + + QSize sizeHint() const override; int count() const; int currentIndex() const; diff --git a/examples/plugindemoform.ui b/examples/plugindemoform.ui index fcc86a5..1e8ad7e 100644 --- a/examples/plugindemoform.ui +++ b/examples/plugindemoform.ui @@ -19,6 +19,12 @@ background-color: rgb(255, 255, 255); + + false + + + MaterialConst::PositionedRipple +