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

make Text Field pimpl class

This commit is contained in:
laserpants 2016-06-14 18:30:46 +03:00
parent c9908a41c4
commit 84c3ce96b4
4 changed files with 152 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

164
components/textfield.cpp
View File

@ -1,81 +1,105 @@
#include <QPropertyAnimation>
#include <QWidget>
#include <QPainter>
#include <QDebug>
#include "textfield.h" #include "textfield.h"
#include "lib/style.h" #include "textfield_p.h"
TextFieldPrivate::TextFieldPrivate(TextField *q)
: q_ptr(q)
{
}
void TextFieldPrivate::init()
{
}
TextField::TextField(QWidget *parent) TextField::TextField(QWidget *parent)
: QLineEdit(parent), : QLineEdit(parent),
_animation(new QPropertyAnimation(this)), d_ptr(new TextFieldPrivate(this))
_progress(1)
{ {
setStyle(&Style::instance()); d_func()->init();
_animation->setPropertyName("progress");
_animation->setTargetObject(this);
_animation->setEasingCurve(QEasingCurve::InCubic);
_animation->setDuration(350);
_animation->setStartValue(1);
_animation->setEndValue(0);
} }
TextField::~TextField() TextField::~TextField()
{ {
} }
void TextField::setProgress(qreal progress) //#include <QPropertyAnimation>
{ //#include <QWidget>
if (_progress == progress) //#include <QPainter>
return; //#include <QDebug>
_progress = progress; //#include "textfield.h"
//#include "lib/style.h"
emit progressChanged(progress); //
update(); //TextField::TextField(QWidget *parent)
} // : QLineEdit(parent),
// _animation(new QPropertyAnimation(this)),
void TextField::focusInEvent(QFocusEvent *event) // _progress(1)
{ //{
_animation->setDirection(QAbstractAnimation::Forward); // setStyle(&Style::instance());
_animation->start(); //
// _animation->setPropertyName("progress");
QLineEdit::focusInEvent(event); // _animation->setTargetObject(this);
} // _animation->setEasingCurve(QEasingCurve::InCubic);
// _animation->setDuration(350);
void TextField::focusOutEvent(QFocusEvent *event) // _animation->setStartValue(1);
{ // _animation->setEndValue(0);
_animation->setDirection(QAbstractAnimation::Backward); //}
_animation->start(); //
//TextField::~TextField()
QLineEdit::focusOutEvent(event); //{
} //}
//
void TextField::mousePressEvent(QMouseEvent *event) //void TextField::setProgress(qreal progress)
{ //{
QLineEdit::mousePressEvent(event); // if (_progress == progress)
} // return;
// _progress = progress;
void TextField::mouseReleaseEvent(QMouseEvent *event) //
{ // emit progressChanged(progress);
QLineEdit::mouseReleaseEvent(event); // update();
} //}
//
void TextField::paintEvent(QPaintEvent *event) //void TextField::focusInEvent(QFocusEvent *event)
{ //{
QLineEdit::paintEvent(event); // _animation->setDirection(QAbstractAnimation::Forward);
// _animation->start();
QPainter painter(this); //
// QLineEdit::focusInEvent(event);
QBrush brush; //}
brush.setStyle(Qt::SolidPattern); //
//void TextField::focusOutEvent(QFocusEvent *event)
if (!qFuzzyCompare(1, _progress)) { //{
// _animation->setDirection(QAbstractAnimation::Backward);
painter.setPen(Qt::NoPen); // _animation->start();
painter.setBrush(brush); //
// QLineEdit::focusOutEvent(event);
int w = _progress*static_cast<qreal>(width()/2); //}
//
painter.drawRect(w, height()-2, width()-w*2, 2); //void TextField::mousePressEvent(QMouseEvent *event)
} //{
} // QLineEdit::mousePressEvent(event);
//}
//
//void TextField::mouseReleaseEvent(QMouseEvent *event)
//{
// QLineEdit::mouseReleaseEvent(event);
//}
//
//void TextField::paintEvent(QPaintEvent *event)
//{
// QLineEdit::paintEvent(event);
//
// QPainter painter(this);
//
// QBrush brush;
// brush.setStyle(Qt::SolidPattern);
//
// if (!qFuzzyCompare(1, _progress)) {
//
// painter.setPen(Qt::NoPen);
// painter.setBrush(brush);
//
// int w = _progress*static_cast<qreal>(width()/2);
//
// painter.drawRect(w, height()-2, width()-w*2, 2);
// }
//}
//

52
components/textfield.h
View File

@ -3,34 +3,54 @@
#include <QLineEdit> #include <QLineEdit>
class QPropertyAnimation; class TextFieldPrivate;
class TextField : public QLineEdit class TextField : public QLineEdit
{ {
Q_OBJECT Q_OBJECT
Q_PROPERTY(qreal progress WRITE setProgress READ progress NOTIFY progressChanged)
public: public:
explicit TextField(QWidget *parent = 0); explicit TextField(QWidget *parent = 0);
~TextField(); ~TextField();
void setProgress(qreal progress);
inline qreal progress() const { return _progress; }
signals:
void progressChanged(qreal);
protected: protected:
void focusInEvent(QFocusEvent *event) Q_DECL_OVERRIDE; const QScopedPointer<TextFieldPrivate> d_ptr;
void focusOutEvent(QFocusEvent *event) Q_DECL_OVERRIDE;
void mousePressEvent(QMouseEvent *event) Q_DECL_OVERRIDE;
void mouseReleaseEvent(QMouseEvent *event) Q_DECL_OVERRIDE;
void paintEvent(QPaintEvent *event) Q_DECL_OVERRIDE;
private: private:
QPropertyAnimation *const _animation; Q_DISABLE_COPY(TextField)
qreal _progress; Q_DECLARE_PRIVATE(TextField)
}; };
//#include <QLineEdit>
//
//class QPropertyAnimation;
//
//class TextField : public QLineEdit
//{
// Q_OBJECT
//
// Q_PROPERTY(qreal progress WRITE setProgress READ progress NOTIFY progressChanged)
//
//public:
// explicit TextField(QWidget *parent = 0);
// ~TextField();
//
// void setProgress(qreal progress);
// inline qreal progress() const { return _progress; }
//
//signals:
// void progressChanged(qreal);
//
//protected:
// void focusInEvent(QFocusEvent *event) Q_DECL_OVERRIDE;
// void focusOutEvent(QFocusEvent *event) Q_DECL_OVERRIDE;
// void mousePressEvent(QMouseEvent *event) Q_DECL_OVERRIDE;
// void mouseReleaseEvent(QMouseEvent *event) Q_DECL_OVERRIDE;
// void paintEvent(QPaintEvent *event) Q_DECL_OVERRIDE;
//
//private:
// QPropertyAnimation *const _animation;
// qreal _progress;
//};
#endif // TEXTFIELD_H #endif // TEXTFIELD_H

20
components/textfield_p.h Normal file
View File

@ -0,0 +1,20 @@
#ifndef TEXTFIELD_P_H
#define TEXTFIELD_P_H
#include <QObject>
class TextField;
class TextFieldPrivate
{
Q_DISABLE_COPY(TextFieldPrivate)
Q_DECLARE_PUBLIC(TextField)
public:
TextFieldPrivate(TextField *q);
void init();
TextField *const q_ptr;
};
#endif // TEXTFIELD_P_H

3
qt-material-widgets.pro
View File

@ -130,7 +130,8 @@ HEADERS += mainwindow.h \
lib/checkable_p.h \ lib/checkable_p.h \
lib/checkable_internal.h \ lib/checkable_internal.h \
components/snackbar.h \ components/snackbar.h \
components/snackbar_p.h components/snackbar_p.h \
components/textfield_p.h
RESOURCES += \ RESOURCES += \
resources.qrc resources.qrc