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

reimplement Tabs component as pimpl class

This commit is contained in:
laserpants 2016-05-30 09:51:46 +03:00
parent d2002ad5e5
commit 83ff691c6a
9 changed files with 412 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
components/tab.cpp
View File

@ -1,18 +1,19 @@
#include "tab.h" //#include "tab.h"
//
Tab::Tab(QWidget *parent) //Tab::Tab(QWidget *parent)
: FlatButton(parent) // : FlatButton(parent)
{ //{
setMinimumHeight(50); // setMinimumHeight(50);
} //}
//
Tab::Tab(QString text, QWidget *parent) //Tab::Tab(QString text, QWidget *parent)
: FlatButton(parent) // : FlatButton(parent)
{ //{
setMinimumHeight(50); // setMinimumHeight(50);
setText(text); // setText(text);
} //}
//
Tab::~Tab() //Tab::~Tab()
{ //{
} //}
//

37
components/tab.h
View File

@ -1,18 +1,19 @@
#ifndef TAB_H //#ifndef TAB_H
#define TAB_H //#define TAB_H
//
#include "flatbutton.h" //#include "flatbutton.h"
//
class QWidget; //class QWidget;
//
class Tab : public FlatButton //class Tab : public FlatButton
{ //{
Q_OBJECT // Q_OBJECT
//
public: //public:
explicit Tab(QWidget *parent = 0); // explicit Tab(QWidget *parent = 0);
explicit Tab(QString text, QWidget *parent = 0); // explicit Tab(QString text, QWidget *parent = 0);
~Tab(); // ~Tab();
}; //};
//
#endif // TAB_H //#endif // TAB_H
//

203
components/tabs.cpp
View File

@ -1,86 +1,193 @@
#include "tabs.h"
#include <QHBoxLayout> #include <QHBoxLayout>
#include <QPainter> #include <QPainter>
#include <QPropertyAnimation> #include <QPropertyAnimation>
#include "tabs.h" #include "tabs_p.h"
#include "tab.h" #include "tabs_internal.h"
TabsPrivate::TabsPrivate(Tabs *q)
: q_ptr(q),
tab(-1)
{
}
void TabsPrivate::init()
{
Q_Q(Tabs);
delegate = new TabsDelegate(q);
tabLayout = new QHBoxLayout;
q->setLayout(tabLayout);
tabLayout->setSpacing(0);
tabLayout->setMargin(0);
}
Tabs::Tabs(QWidget *parent) Tabs::Tabs(QWidget *parent)
: QWidget(parent), : QWidget(parent),
_tabLayout(new QHBoxLayout), d_ptr(new TabsPrivate(this))
_animation(new QPropertyAnimation(this)),
_tab(0),
_tween(1)
{ {
_animation->setPropertyName("tween"); d_func()->init();
_animation->setEasingCurve(QEasingCurve::OutCirc);
_animation->setTargetObject(this);
_animation->setDuration(700);
setLayout(_tabLayout);
_tabLayout->setSpacing(0);
_tabLayout->setMargin(0);
} }
Tabs::~Tabs() Tabs::~Tabs()
{ {
} }
void Tabs::addTab(Tab *tab) void Tabs::addTab(const QString &text)
{ {
_tabLayout->addWidget(tab); Q_D(Tabs);
connect(tab, SIGNAL(clicked()), this, SLOT(switchActiveTab()));
Tab *tab = new Tab(text);
tab->setCornerRadius(0);
d->tabLayout->addWidget(tab);
if (-1 == d->tab) {
d->tab = 0;
d->delegate->updateInkBar();
}
connect(tab, SIGNAL(clicked()), this, SLOT(switchTab()));
}
const QLayout *Tabs::tabLayout() const
{
Q_D(const Tabs);
return d->tabLayout;
}
int Tabs::currentIndex() const
{
Q_D(const Tabs);
return d->tab;
} }
void Tabs::paintEvent(QPaintEvent *event) void Tabs::paintEvent(QPaintEvent *event)
{ {
Q_UNUSED(event) Q_D(Tabs);
QPainter painter(this); QPainter painter(this);
painter.fillRect(_inkBarGeometry, Qt::black); painter.fillRect(d->delegate->inkBarGeometry(), Qt::black);
}
void Tabs::switchActiveTab() QWidget::paintEvent(event);
{
Tab *tab = static_cast<Tab *>(sender());
if (tab) {
_previousGeometry = _inkBarGeometry;
_tab = _tabLayout->indexOf(tab);
_inkBarGeometry = _tabLayout->itemAt(_tab)->geometry();
_animation->stop();
_animation->setStartValue(0);
_animation->setEndValue(1);
_animation->start();
emit currentChanged(_tab);
}
} }
void Tabs::moveEvent(QMoveEvent *event) void Tabs::moveEvent(QMoveEvent *event)
{ {
Q_UNUSED(event) Q_UNUSED(event)
updateInkBar(); Q_D(Tabs);
d->delegate->updateInkBar();
} }
void Tabs::resizeEvent(QResizeEvent *event) void Tabs::resizeEvent(QResizeEvent *event)
{ {
Q_UNUSED(event) Q_UNUSED(event)
updateInkBar(); Q_D(Tabs);
d->delegate->updateInkBar();
} }
void Tabs::updateInkBar() void Tabs::switchTab()
{ {
QLayoutItem *item = _tabLayout->itemAt(_tab); Q_D(Tabs);
if (item) {
const QRect &r = item->geometry(); Tab *tab = static_cast<Tab *>(sender());
const qreal s = 1-_tween; if (tab) {
if (QAbstractAnimation::Running != _animation->state()) { d->tab = d->tabLayout->indexOf(tab);
_inkBarGeometry = QRect(r.left(), r.bottom()-1, r.width(), 2); d->delegate->setInkBarGeometry(d->tabLayout->itemAt(d->tab)->geometry());
} else { emit currentChanged(d->tab);
const qreal left = _previousGeometry.left()*s + r.left()*_tween;
const qreal width = _previousGeometry.width()*s + r.width()*_tween;
_inkBarGeometry = QRect(left, r.bottom()-1, width, 2);
}
update();
} }
} }
//#include <QHBoxLayout>
//#include <QPainter>
//#include <QPropertyAnimation>
//#include "tabs.h"
//#include "tab.h"
//
//Tabs::Tabs(QWidget *parent)
// : QWidget(parent),
// _tabLayout(new QHBoxLayout),
// _animation(new QPropertyAnimation(this)),
// _tab(0),
// _tween(1)
//{
// _animation->setPropertyName("tween");
// _animation->setEasingCurve(QEasingCurve::OutCirc);
// _animation->setTargetObject(this);
// _animation->setDuration(700);
//
// setLayout(_tabLayout);
// _tabLayout->setSpacing(0);
// _tabLayout->setMargin(0);
//}
//
//Tabs::~Tabs()
//{
//}
//
//void Tabs::addTab(Tab *tab)
//{
// _tabLayout->addWidget(tab);
// connect(tab, SIGNAL(clicked()), this, SLOT(switchActiveTab()));
//}
//
//void Tabs::paintEvent(QPaintEvent *event)
//{
// Q_UNUSED(event)
//
// QPainter painter(this);
// painter.fillRect(_inkBarGeometry, Qt::black);
//}
//
//void Tabs::switchActiveTab()
//{
// Tab *tab = static_cast<Tab *>(sender());
// if (tab) {
// _previousGeometry = _inkBarGeometry;
// _tab = _tabLayout->indexOf(tab);
// _inkBarGeometry = _tabLayout->itemAt(_tab)->geometry();
// _animation->stop();
// _animation->setStartValue(0);
// _animation->setEndValue(1);
// _animation->start();
// emit currentChanged(_tab);
// }
//}
//
//void Tabs::moveEvent(QMoveEvent *event)
//{
// Q_UNUSED(event)
//
// UpdateInkBar();
//}
//
//void Tabs::resizeEvent(QResizeEvent *event)
//{
// Q_UNUSED(event)
//
// updateInkBar();
//}
//
//void Tabs::updateInkBar()
//{
// QLayoutItem *item = _tabLayout->itemAt(_tab);
// if (item) {
// const QRect &r = item->geometry();
// const qreal s = 1-_tween;
// if (QAbstractAnimation::Running != _animation->state()) {
// _inkBarGeometry = QRect(r.left(), r.bottom()-1, r.width(), 2);
// } else {
// const qreal left = _previousGeometry.left()*s + r.left()*_tween;
// const qreal width = _previousGeometry.width()*s + r.width()*_tween;
// _inkBarGeometry = QRect(left, r.bottom()-1, width, 2);
// }
// update();
// }
//}
//

78
components/tabs.h
View File

@ -3,45 +3,83 @@
#include <QWidget> #include <QWidget>
class QHBoxLayout; class TabsPrivate;
class QPropertyAnimation;
class Tab;
class Tabs : public QWidget class Tabs : public QWidget
{ {
Q_OBJECT Q_OBJECT
Q_PROPERTY(qreal tween WRITE setTween READ tween)
public: public:
explicit Tabs(QWidget *parent = 0); explicit Tabs(QWidget *parent = 0);
~Tabs(); ~Tabs();
inline void setTween(qreal tween) { _tween = tween; updateInkBar(); } void addTab(const QString &text);
inline qreal tween() const { return _tween; }
void addTab(Tab *tab); const QLayout *tabLayout() const;
int currentIndex() const;
signals:
void currentChanged(int);
protected: protected:
void paintEvent(QPaintEvent *event) Q_DECL_OVERRIDE; void paintEvent(QPaintEvent *event) Q_DECL_OVERRIDE;
void moveEvent(QMoveEvent *event) Q_DECL_OVERRIDE; void moveEvent(QMoveEvent *event) Q_DECL_OVERRIDE;
void resizeEvent(QResizeEvent *event) Q_DECL_OVERRIDE; void resizeEvent(QResizeEvent *event) Q_DECL_OVERRIDE;
protected slots: const QScopedPointer<TabsPrivate> d_ptr;
void switchActiveTab();
signals: private slots:
void currentChanged(int); void switchTab();
private: private:
void updateInkBar(); Q_DISABLE_COPY(Tabs)
Q_DECLARE_PRIVATE(Tabs)
QHBoxLayout *const _tabLayout;
QPropertyAnimation *const _animation;
QRect _inkBarGeometry;
QRect _previousGeometry;
int _tab;
qreal _tween;
}; };
#endif // TABS_H #endif // TABS_H
//#include <QWidget>
//
//class QHBoxLayout;
//class QPropertyAnimation;
//class Tab;
//
//class Tabs : public QWidget
//{
// Q_OBJECT
//
// Q_PROPERTY(qreal tween WRITE setTween READ tween)
//
//public:
// explicit Tabs(QWidget *parent = 0);
// ~Tabs();
//
// inline void setTween(qreal tween) { _tween = tween; updateInkBar(); }
// inline qreal tween() const { return _tween; }
//
// void addTab(Tab *tab);
//
//protected:
// void paintEvent(QPaintEvent *event) Q_DECL_OVERRIDE;
// void moveEvent(QMoveEvent *event) Q_DECL_OVERRIDE;
// void resizeEvent(QResizeEvent *event) Q_DECL_OVERRIDE;
//
//protected slots:
// void switchActiveTab();
//
//signals:
// void currentChanged(int);
//
//private:
// void updateInkBar();
//
// QHBoxLayout *const _tabLayout;
// QPropertyAnimation *const _animation;
// QRect _inkBarGeometry;
// QRect _previousGeometry;
// int _tab;
// qreal _tween;
//};
//
//#endif // TABS_H
//

78
components/tabs_internal.cpp
View File

@ -0,0 +1,78 @@
#include "tabs_internal.h"
#include <QLayout>
#include <QPropertyAnimation>
#include "tabs.h"
TabsDelegate::TabsDelegate(Tabs *parent)
: QObject(parent),
tabs(parent),
_animation(new QPropertyAnimation(parent)),
_tween(0)
{
_animation->setPropertyName("tween");
_animation->setEasingCurve(QEasingCurve::OutCirc);
_animation->setTargetObject(this);
_animation->setDuration(700);
}
TabsDelegate::~TabsDelegate()
{
}
void TabsDelegate::setTween(qreal tween)
{
_tween = tween;
updateInkBar();
}
void TabsDelegate::setInkBarGeometry(const QRect &newGeometry)
{
_previousGeometry = _inkBarGeometry;
_inkBarGeometry = newGeometry;
_animation->stop();
_animation->setStartValue(0);
_animation->setEndValue(1);
_animation->start();
}
void TabsDelegate::updateInkBar()
{
QLayoutItem *item = tabs->tabLayout()->itemAt(tabs->currentIndex());
if (item) {
const QRect &r = item->geometry();
const qreal s = 1-_tween;
if (QAbstractAnimation::Running != _animation->state()) {
_inkBarGeometry = QRect(r.left(), r.bottom()-1, r.width(), 2);
} else {
const qreal left = _previousGeometry.left()*s + r.left()*_tween;
const qreal width = _previousGeometry.width()*s + r.width()*_tween;
_inkBarGeometry = QRect(left, r.bottom()-1, width, 2);
}
tabs->update();
}
}
Tab::Tab(QWidget *parent)
: FlatButton(parent)
{
init();
}
Tab::Tab(QString text, QWidget *parent)
: FlatButton(parent)
{
init();
setText(text);
}
Tab::~Tab()
{
}
void Tab::init()
{
setMinimumHeight(50);
}

49
components/tabs_internal.h
View File

@ -1,4 +1,53 @@
#ifndef TABS_INTERNAL_H #ifndef TABS_INTERNAL_H
#define TABS_INTERNAL_H #define TABS_INTERNAL_H
#include <QObject>
#include "flatbutton.h"
class QPropertyAnimation;
class Tabs;
class TabsDelegate : public QObject
{
Q_OBJECT
Q_PROPERTY(qreal tween WRITE setTween READ tween)
public:
TabsDelegate(Tabs *parent);
~TabsDelegate();
void setTween(qreal tween);
inline qreal tween() const { return _tween; }
void setInkBarGeometry(const QRect &newGeometry);
inline QRect inkBarGeometry() const { return _inkBarGeometry; }
\
void updateInkBar();
private:
Q_DISABLE_COPY(TabsDelegate)
Tabs *const tabs;
QPropertyAnimation *_animation;
qreal _tween;
QRect _inkBarGeometry;
QRect _previousGeometry;
};
class Tab : public FlatButton
{
Q_OBJECT
public:
explicit Tab(QWidget *parent = 0);
explicit Tab(QString text, QWidget *parent = 0);
~Tab();
private:
Q_DISABLE_COPY(Tab)
void init();
};
#endif // TABS_INTERNAL_H #endif // TABS_INTERNAL_H

22
components/tabs_p.h
View File

@ -1,4 +1,26 @@
#ifndef TABS_P_H #ifndef TABS_P_H
#define TABS_P_H #define TABS_P_H
#include <QRect>
class QHBoxLayout;
class Tabs;
class TabsDelegate;
class TabsPrivate
{
Q_DISABLE_COPY(TabsPrivate)
Q_DECLARE_PUBLIC(Tabs)
public:
TabsPrivate(Tabs *q);
void init();
Tabs *const q_ptr;
TabsDelegate *delegate;
QHBoxLayout *tabLayout;
int tab;
};
#endif // TABS_P_H #endif // TABS_P_H

10
examples/tabsexamples.cpp
View File

@ -27,9 +27,13 @@ TabsExamples::TabsExamples(QWidget *parent)
layout->addLayout(stack); layout->addLayout(stack);
layout->setContentsMargins(0, 0, 0, 0); layout->setContentsMargins(0, 0, 0, 0);
tabs->addTab(new Tab("First")); tabs->addTab("First");
tabs->addTab(new Tab("Second")); tabs->addTab("Second");
tabs->addTab(new Tab("Third")); tabs->addTab("Third");
//tabs->addTab(new Tab("First"));
//tabs->addTab(new Tab("Second"));
//tabs->addTab(new Tab("Third"));
QScrollArea *area = new QScrollArea; QScrollArea *area = new QScrollArea;
area->setWidget(widget); area->setWidget(widget);

7
qt-material-widgets.pro
View File

@ -55,7 +55,8 @@ SOURCES += main.cpp\
lib/theme.cpp \ lib/theme.cpp \
components/slider_internal.cpp \ components/slider_internal.cpp \
components/flatbutton_internal.cpp \ components/flatbutton_internal.cpp \
components/toggle_internal.cpp components/toggle_internal.cpp \
components/tabs_internal.cpp
HEADERS += mainwindow.h \ HEADERS += mainwindow.h \
components/appbar.h \ components/appbar.h \
@ -110,7 +111,9 @@ HEADERS += mainwindow.h \
components/raisedbutton_p.h \ components/raisedbutton_p.h \
components/toggle_p.h \ components/toggle_p.h \
components/toggle_internal.h \ components/toggle_internal.h \
components/iconbutton_p.h components/iconbutton_p.h \
components/tabs_p.h \
components/tabs_internal.h
RESOURCES += \ RESOURCES += \
resources.qrc resources.qrc