Skip to content

Commit d649335

Browse files
committed
Update tab widget
1 parent c1ab901 commit d649335

File tree

4 files changed

+83
-1
lines changed

4 files changed

+83
-1
lines changed

components/qtmaterialtabs.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,11 @@ class QtMaterialTab;
1212
class QT_MATERIAL_EXPORT QtMaterialTabs : public QWidget
1313
{
1414
Q_OBJECT
15+
Q_PROPERTY(bool haloVisible WRITE setHaloVisible READ isHaloVisible)
16+
Q_PROPERTY(MaterialConst::RippleStyle rippleStyle WRITE setRippleStyle READ rippleStyle)
17+
Q_PROPERTY(QColor inkColor WRITE setInkColor READ inkColor)
18+
Q_PROPERTY(QColor backgroundColor WRITE setBackgroundColor READ backgroundColor)
19+
Q_PROPERTY(QColor textColor WRITE setTextColor READ textColor)
1520

1621
public:
1722
explicit QtMaterialTabs(QWidget *parent = 0);

components/qtmaterialtabwidget.cpp

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ QtMaterialTabWidget::QtMaterialTabWidget(QWidget *parent)
99
, stackWidget(new QStackedWidget)
1010
{
1111
tabBar->setObjectName(QStringLiteral("__qt__passive_tabBar"));
12+
tabBar->setHaloVisible(false);
1213

1314
connect(tabBar, QOverload<int>::of(&QtMaterialTabs::currentChanged),
1415
this, &QtMaterialTabWidget::setCurrentIndex);
@@ -18,6 +19,56 @@ QtMaterialTabWidget::QtMaterialTabWidget(QWidget *parent)
1819
layout->addWidget(stackWidget);
1920
}
2021

22+
void QtMaterialTabWidget::setHaloVisible(bool value)
23+
{
24+
tabBar->setHaloVisible(value);
25+
}
26+
27+
bool QtMaterialTabWidget::isHaloVisible() const
28+
{
29+
return tabBar->isHaloVisible();
30+
}
31+
32+
void QtMaterialTabWidget::setRippleStyle(MaterialConst::RippleStyle style)
33+
{
34+
tabBar->setRippleStyle(style);
35+
}
36+
37+
MaterialConst::RippleStyle QtMaterialTabWidget::rippleStyle() const
38+
{
39+
return tabBar->rippleStyle();
40+
}
41+
42+
void QtMaterialTabWidget::setInkColor(const QColor &color)
43+
{
44+
tabBar->setInkColor(color);
45+
}
46+
47+
QColor QtMaterialTabWidget::inkColor() const
48+
{
49+
return tabBar->inkColor();
50+
}
51+
52+
void QtMaterialTabWidget::setBackgroundColor(const QColor &color)
53+
{
54+
tabBar->setBackgroundColor(color);
55+
}
56+
57+
QColor QtMaterialTabWidget::backgroundColor() const
58+
{
59+
return tabBar->backgroundColor();
60+
}
61+
62+
void QtMaterialTabWidget::setTextColor(const QColor &color)
63+
{
64+
tabBar->setTextColor(color);
65+
}
66+
67+
QColor QtMaterialTabWidget::textColor() const
68+
{
69+
return tabBar->textColor();
70+
}
71+
2172
QSize QtMaterialTabWidget::sizeHint() const
2273
{
2374
return QSize(300, 200);

components/qtmaterialtabwidget.h

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
#include <QWidget>
55
#include "qtmaterial_global.h"
6+
#include "lib/qtmaterialtheme.h"
67

78
QT_BEGIN_NAMESPACE
89
class QStackedWidget;
@@ -14,12 +15,31 @@ class QT_MATERIAL_EXPORT QtMaterialTabWidget : public QWidget
1415
Q_OBJECT
1516
Q_PROPERTY(int currentIndex READ currentIndex WRITE setCurrentIndex)
1617
Q_PROPERTY(QString pageTitle READ pageTitle WRITE setPageTitle STORED false)
18+
Q_PROPERTY(bool haloVisible WRITE setHaloVisible READ isHaloVisible)
19+
Q_PROPERTY(MaterialConst::RippleStyle rippleStyle WRITE setRippleStyle READ rippleStyle)
20+
Q_PROPERTY(QColor inkColor WRITE setInkColor READ inkColor)
21+
Q_PROPERTY(QColor backgroundColor WRITE setBackgroundColor READ backgroundColor)
22+
Q_PROPERTY(QColor textColor WRITE setTextColor READ textColor)
1723

1824
public:
1925
explicit QtMaterialTabWidget(QWidget *parent = nullptr);
2026

21-
QSize sizeHint() const override;
27+
void setHaloVisible(bool value);
28+
bool isHaloVisible() const;
29+
30+
void setRippleStyle(MaterialConst::RippleStyle style);
31+
MaterialConst::RippleStyle rippleStyle() const;
32+
33+
void setInkColor(const QColor &color);
34+
QColor inkColor() const;
2235

36+
void setBackgroundColor(const QColor &color);
37+
QColor backgroundColor() const;
38+
39+
void setTextColor(const QColor &color);
40+
QColor textColor() const;
41+
42+
QSize sizeHint() const override;
2343

2444
int count() const;
2545
int currentIndex() const;

examples/plugindemoform.ui

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,12 @@
1919
<property name="styleSheet">
2020
<string notr="true">background-color: rgb(255, 255, 255);</string>
2121
</property>
22+
<property name="haloVisible">
23+
<bool>false</bool>
24+
</property>
25+
<property name="rippleStyle">
26+
<enum>MaterialConst::PositionedRipple</enum>
27+
</property>
2228
<widget class="QWidget" name="page">
2329
<layout class="QGridLayout" name="gridLayout">
2430
<item row="0" column="0">

0 commit comments

Comments
 (0)