From fae8e8c5d4936cd85e1ccc192c5e0082b5f87252 Mon Sep 17 00:00:00 2001 From: fperillo Date: Thu, 5 Oct 2017 07:03:56 +0200 Subject: [PATCH 1/4] Divider: first commit --- components/components.pro | 3 + components/qtmaterialdivider.cpp | 138 +++++++++++++++++++++++++++++ components/qtmaterialdivider.h | 52 +++++++++++ components/qtmaterialdivider_p.h | 33 +++++++ examples/dividersettingseditor.cpp | 56 ++++++++++++ examples/dividersettingseditor.h | 26 ++++++ examples/dividersettingsform.ui | 32 +++++++ examples/examples.pro | 3 + examples/mainwindow.cpp | 4 + 9 files changed, 347 insertions(+) create mode 100644 components/qtmaterialdivider.cpp create mode 100644 components/qtmaterialdivider.h create mode 100644 components/qtmaterialdivider_p.h create mode 100644 examples/dividersettingseditor.cpp create mode 100644 examples/dividersettingseditor.h create mode 100644 examples/dividersettingsform.ui diff --git a/components/components.pro b/components/components.pro index 021bd62..3889810 100644 --- a/components/components.pro +++ b/components/components.pro @@ -1,6 +1,7 @@ TEMPLATE = lib CONFIG += staticlib SOURCES = \ + qtmaterialdivider.cpp \ qtmaterialavatar.cpp \ lib/qtmaterialstyle.cpp \ lib/qtmaterialtheme.cpp \ @@ -39,6 +40,8 @@ SOURCES = \ qtmaterialdrawer_internal.cpp \ qtmaterialdrawer.cpp HEADERS = \ + qtmaterialdivider_p.h \ + qtmaterialdivider.h \ qtmaterialavatar_p.h \ qtmaterialavatar.h \ lib/qtmaterialstyle_p.h \ diff --git a/components/qtmaterialdivider.cpp b/components/qtmaterialdivider.cpp new file mode 100644 index 0000000..c88e419 --- /dev/null +++ b/components/qtmaterialdivider.cpp @@ -0,0 +1,138 @@ +#include "qtmaterialdivider.h" +#include "qtmaterialdivider_p.h" +#include +#include "lib/qtmaterialstyle.h" + +/*! + * \class QtMaterialDividerPrivate + * \internal + */ + +/*! + * \internal + */ +QtMaterialDividerPrivate::QtMaterialDividerPrivate(QtMaterialDivider *q) + : q_ptr(q) +{ +} + +/*! + * \internal + */ +QtMaterialDividerPrivate::~QtMaterialDividerPrivate() +{ +} + +/*! + * \internal + */ +void QtMaterialDividerPrivate::init() +{ + Q_Q(QtMaterialDivider); + + size = 40; + useThemeColors = true; + + QSizePolicy policy(QSizePolicy::Ignored, + // QSizePolicy policy(QSizePolicy::Expanding, + QSizePolicy::Fixed); + q->setSizePolicy(policy); +} + +/*! + * \class QtMaterialDivider + */ + +QtMaterialDivider::QtMaterialDivider(QWidget *parent) + : QWidget(parent), + d_ptr(new QtMaterialDividerPrivate(this)) +{ + d_func()->init(); +} + +QtMaterialDivider::~QtMaterialDivider() +{ +} + +void QtMaterialDivider::setUseThemeColors(bool value) +{ + Q_D(QtMaterialDivider); + + if (d->useThemeColors == value) { + return; + } + + d->useThemeColors = value; + update(); +} + +bool QtMaterialDivider::useThemeColors() const +{ + Q_D(const QtMaterialDivider); + + return d->useThemeColors; +} + + +/*! + * \reimp + */ +QSize QtMaterialDivider::sizeHint() const +{ + Q_D(const QtMaterialDivider); + + return QSize(d->size, 2+2); +} + +void QtMaterialDivider::setSize(int size) +{ + Q_D(QtMaterialDivider); + + d->size = size; + + update(); +} + +int QtMaterialDivider::size() const +{ + Q_D(const QtMaterialDivider); + + return d->size; +} + +/*! + * \reimp + */ +void QtMaterialDivider::resizeEvent(QResizeEvent *event) +{ + Q_D(QtMaterialDivider); + + QWidget::resizeEvent(event); + QSize sz = event->size(); + d->size = width(); + update(); +} + + +/*! + * \reimp + */ +void QtMaterialDivider::paintEvent(QPaintEvent *event) +{ + Q_UNUSED(event) + + Q_D(QtMaterialDivider); + + QPainter painter(this); + painter.setRenderHint(QPainter::Antialiasing); + + const int wd = d->size; // width(); + QPen pen; + pen.setWidth(2); + // pen.setColor(QtMaterialStyle::instance().themeColor("border")); + pen.setColor(QColor(255,0,0)); + painter.setPen(pen); + painter.setOpacity(1); + painter.drawLine(0, 1, wd, 1); + +} diff --git a/components/qtmaterialdivider.h b/components/qtmaterialdivider.h new file mode 100644 index 0000000..bdcc5e9 --- /dev/null +++ b/components/qtmaterialdivider.h @@ -0,0 +1,52 @@ +#ifndef QTMATERIALDIVIDER_H +#define QTMATERIALDIVIDER_H + +#include +#include +#include "lib/qtmaterialtheme.h" + +class QtMaterialDividerPrivate; + +class QtMaterialDivider : public QWidget +{ + Q_OBJECT + +public: + explicit QtMaterialDivider(QWidget *parent = 0); + //explicit QtMaterialDivider(const QIcon &icon, QWidget *parent = 0); + //explicit QtMaterialDivider(const QChar &letter, QWidget *parent = 0); + //explicit QtMaterialDivider(const QImage &image, QWidget *parent = 0); + ~QtMaterialDivider(); + + void setUseThemeColors(bool value); + bool useThemeColors() const; + + //void setTextColor(const QColor &color); + //QColor textColor() const; + + //void setBackgroundColor(const QColor &color); + //QColor backgroundColor() const; + + QSize sizeHint() const Q_DECL_OVERRIDE; + + void setSize(int size); + int size() const; + + //void setLetter(const QChar &letter); + //void setImage(const QImage &image); + //void setIcon(const QIcon &icon); + + //Material::DividerType type() const; + +protected: + void resizeEvent(QResizeEvent *event) Q_DECL_OVERRIDE; + void paintEvent(QPaintEvent *event) Q_DECL_OVERRIDE; + + const QScopedPointer d_ptr; + +private: + Q_DISABLE_COPY(QtMaterialDivider) + Q_DECLARE_PRIVATE(QtMaterialDivider) +}; + +#endif // QTMATERIALDIVIDER_H diff --git a/components/qtmaterialdivider_p.h b/components/qtmaterialdivider_p.h new file mode 100644 index 0000000..d631ad3 --- /dev/null +++ b/components/qtmaterialdivider_p.h @@ -0,0 +1,33 @@ +#ifndef QTMATERIALDIVIDER_P_H +#define QTMATERIALDIVIDER_P_H + +#include +#include +#include "lib/qtmaterialtheme.h" + +class QtMaterialDivider; + +class QtMaterialDividerPrivate +{ + Q_DISABLE_COPY(QtMaterialDividerPrivate) + Q_DECLARE_PUBLIC(QtMaterialDivider) + +public: + QtMaterialDividerPrivate(QtMaterialDivider *q); + ~QtMaterialDividerPrivate(); + + void init(); + + QtMaterialDivider *const q_ptr; + int size; +// Material::DividerType type; +// QChar letter; +// QImage image; +// QIcon icon; +// QPixmap pixmap; + bool useThemeColors; +// QColor textColor; +// QColor backgroundColor; +}; + +#endif // QTMATERIALDIVIDER_P_H diff --git a/examples/dividersettingseditor.cpp b/examples/dividersettingseditor.cpp new file mode 100644 index 0000000..232311f --- /dev/null +++ b/examples/dividersettingseditor.cpp @@ -0,0 +1,56 @@ +#include "dividersettingseditor.h" +#include +#include +#include +#include + +DividerSettingsEditor::DividerSettingsEditor(QWidget *parent) + : QWidget(parent), + ui(new Ui::DividerSettingsForm), + m_divider(new QtMaterialDivider) +{ + QVBoxLayout *layout = new QVBoxLayout; + setLayout(layout); + + QWidget *widget = new QWidget; + layout->addWidget(widget); + + QWidget *canvas = new QWidget; + canvas->setStyleSheet("QWidget { background: white; }"); + layout->addWidget(canvas); + + ui->setupUi(widget); + layout->setContentsMargins(20, 20, 20, 20); + + QLabel *lbl = new QLabel; +lbl->setText( "1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 " ); + + layout = new QVBoxLayout; + canvas->setLayout(layout); + layout->addWidget(m_divider); + layout->setAlignment(m_divider, Qt::AlignCenter); + m_divider->setSize( canvas->width() ); + layout->addWidget(lbl); + QSizePolicy policy(QSizePolicy::Ignored, + QSizePolicy::Fixed); + lbl->setSizePolicy(policy); + m_divider->setSizePolicy(policy); + + + setupForm(); + +} + +DividerSettingsEditor::~DividerSettingsEditor() +{ + delete ui; +} + +void DividerSettingsEditor::setupForm() +{ +} + +void DividerSettingsEditor::updateWidget() +{ +} + diff --git a/examples/dividersettingseditor.h b/examples/dividersettingseditor.h new file mode 100644 index 0000000..96c10a5 --- /dev/null +++ b/examples/dividersettingseditor.h @@ -0,0 +1,26 @@ +#ifndef DIVIDERSETTINGSEDITOR_H +#define DIVIDERSETTINGSEDITOR_H + +#include +#include "ui_dividersettingsform.h" + +class QtMaterialDivider; + +class DividerSettingsEditor : public QWidget +{ + Q_OBJECT + +public: + explicit DividerSettingsEditor(QWidget *parent = 0); + ~DividerSettingsEditor(); + +protected slots: + void setupForm(); + void updateWidget(); + +private: + Ui::DividerSettingsForm *const ui; + QtMaterialDivider *const m_divider; +}; + +#endif // DIVIDERSETTINGSEDITOR_H diff --git a/examples/dividersettingsform.ui b/examples/dividersettingsform.ui new file mode 100644 index 0000000..7f2447d --- /dev/null +++ b/examples/dividersettingsform.ui @@ -0,0 +1,32 @@ + + + DividerSettingsForm + + + + 0 + 0 + 599 + 418 + + + + Form + + + + + 20 + 30 + 171 + 16 + + + + TODO + + + + + + diff --git a/examples/examples.pro b/examples/examples.pro index 99d8639..f703b69 100644 --- a/examples/examples.pro +++ b/examples/examples.pro @@ -18,6 +18,7 @@ SOURCES = mainwindow.cpp \ textfieldsettingseditor.cpp \ tabssettingseditor.cpp \ snackbarsettingseditor.cpp \ + dividersettingseditor.cpp \ dialogsettingseditor.cpp \ drawersettingseditor.cpp \ scrollbarsettingseditor.cpp @@ -37,6 +38,7 @@ HEADERS = mainwindow.h \ textfieldsettingseditor.h \ tabssettingseditor.h \ snackbarsettingseditor.h \ + dividersettingseditor.h \ dialogsettingseditor.h \ drawersettingseditor.h \ scrollbarsettingseditor.h @@ -59,6 +61,7 @@ FORMS += \ circularprogresssettingsform.ui \ slidersettingsform.ui \ snackbarsettingsform.ui \ + dividersettingsform.ui \ radiobuttonsettingsform.ui \ togglesettingsform.ui \ textfieldsettingsform.ui \ diff --git a/examples/mainwindow.cpp b/examples/mainwindow.cpp index 365633f..7df3442 100644 --- a/examples/mainwindow.cpp +++ b/examples/mainwindow.cpp @@ -20,6 +20,7 @@ #include "dialogsettingseditor.h" #include "drawersettingseditor.h" #include "scrollbarsettingseditor.h" +#include "dividersettingseditor.h" MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent) @@ -57,12 +58,14 @@ MainWindow::MainWindow(QWidget *parent) DialogSettingsEditor *dialog = new DialogSettingsEditor; DrawerSettingsEditor *drawer = new DrawerSettingsEditor; ScrollBarSettingsEditor *scrollBar = new ScrollBarSettingsEditor; + DividerSettingsEditor *divider = new DividerSettingsEditor; stack->addWidget(avatar); stack->addWidget(badge); stack->addWidget(checkbox); stack->addWidget(circularProgress); stack->addWidget(dialog); + stack->addWidget(divider); stack->addWidget(drawer); stack->addWidget(fab); stack->addWidget(flatButton); @@ -82,6 +85,7 @@ MainWindow::MainWindow(QWidget *parent) list->addItem("Checkbox"); list->addItem("Circular Progress"); list->addItem("Dialog"); + list->addItem("Divider"); list->addItem("Drawer"); list->addItem("Floating Action Button"); list->addItem("Flat Button"); From 4953fcd1e19d5a65705001d524f06597f03929ab Mon Sep 17 00:00:00 2001 From: Francesco Perillo Date: Thu, 5 Oct 2017 14:15:36 +0200 Subject: [PATCH 2/4] Divider --- components/qtmaterialdivider.cpp | 75 +++++++++--------------------- components/qtmaterialdivider.h | 25 +--------- components/qtmaterialdivider_p.h | 8 ---- examples/dividersettingseditor.cpp | 27 +++++++---- 4 files changed, 41 insertions(+), 94 deletions(-) diff --git a/components/qtmaterialdivider.cpp b/components/qtmaterialdivider.cpp index c88e419..cc7e35e 100644 --- a/components/qtmaterialdivider.cpp +++ b/components/qtmaterialdivider.cpp @@ -30,13 +30,12 @@ void QtMaterialDividerPrivate::init() { Q_Q(QtMaterialDivider); - size = 40; - useThemeColors = true; + size = 0; - QSizePolicy policy(QSizePolicy::Ignored, - // QSizePolicy policy(QSizePolicy::Expanding, + QSizePolicy policy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed); - q->setSizePolicy(policy); + q->setMinimumHeight( 4 ); + q->setMaximumHeight( 14 ); } /*! @@ -54,37 +53,11 @@ QtMaterialDivider::~QtMaterialDivider() { } -void QtMaterialDivider::setUseThemeColors(bool value) -{ - Q_D(QtMaterialDivider); - - if (d->useThemeColors == value) { - return; - } - - d->useThemeColors = value; - update(); -} - -bool QtMaterialDivider::useThemeColors() const -{ - Q_D(const QtMaterialDivider); - - return d->useThemeColors; -} - - /*! * \reimp */ -QSize QtMaterialDivider::sizeHint() const -{ - Q_D(const QtMaterialDivider); - return QSize(d->size, 2+2); -} - -void QtMaterialDivider::setSize(int size) +void QtMaterialDivider::setInsetSize(int size) { Q_D(QtMaterialDivider); @@ -93,27 +66,13 @@ void QtMaterialDivider::setSize(int size) update(); } -int QtMaterialDivider::size() const +int QtMaterialDivider::insetSize() const { Q_D(const QtMaterialDivider); return d->size; } -/*! - * \reimp - */ -void QtMaterialDivider::resizeEvent(QResizeEvent *event) -{ - Q_D(QtMaterialDivider); - - QWidget::resizeEvent(event); - QSize sz = event->size(); - d->size = width(); - update(); -} - - /*! * \reimp */ @@ -124,15 +83,23 @@ void QtMaterialDivider::paintEvent(QPaintEvent *event) Q_D(QtMaterialDivider); QPainter painter(this); - painter.setRenderHint(QPainter::Antialiasing); + // TODO: QtMaterialText doesn't use Antialiasing. Usng it the line is more "heavy" + // painter.setRenderHint(QPainter::Antialiasing); - const int wd = d->size; // width(); QPen pen; - pen.setWidth(2); - // pen.setColor(QtMaterialStyle::instance().themeColor("border")); - pen.setColor(QColor(255,0,0)); + pen.setWidth(1); + /* + * DEBUG: to paint in blue the full widget + * + */ + // painter.fillRect( rect() ,QColor(0,0,255)); + + // TODO: is this the right color to use? + pen.setColor(QtMaterialStyle::instance().themeColor("border")); + painter.setPen(pen); painter.setOpacity(1); - painter.drawLine(0, 1, wd, 1); - + // TODO: implementing inset, 0 will be changed to a calculated point. + // Normally, line should go from 0 to the end + painter.drawLine( d->size, height()/2, width(), height()/2); } diff --git a/components/qtmaterialdivider.h b/components/qtmaterialdivider.h index bdcc5e9..24024dc 100644 --- a/components/qtmaterialdivider.h +++ b/components/qtmaterialdivider.h @@ -13,33 +13,12 @@ class QtMaterialDivider : public QWidget public: explicit QtMaterialDivider(QWidget *parent = 0); - //explicit QtMaterialDivider(const QIcon &icon, QWidget *parent = 0); - //explicit QtMaterialDivider(const QChar &letter, QWidget *parent = 0); - //explicit QtMaterialDivider(const QImage &image, QWidget *parent = 0); ~QtMaterialDivider(); - void setUseThemeColors(bool value); - bool useThemeColors() const; - - //void setTextColor(const QColor &color); - //QColor textColor() const; - - //void setBackgroundColor(const QColor &color); - //QColor backgroundColor() const; - - QSize sizeHint() const Q_DECL_OVERRIDE; - - void setSize(int size); - int size() const; - - //void setLetter(const QChar &letter); - //void setImage(const QImage &image); - //void setIcon(const QIcon &icon); - - //Material::DividerType type() const; + void setInsetSize(int size); + int insetSize() const; protected: - void resizeEvent(QResizeEvent *event) Q_DECL_OVERRIDE; void paintEvent(QPaintEvent *event) Q_DECL_OVERRIDE; const QScopedPointer d_ptr; diff --git a/components/qtmaterialdivider_p.h b/components/qtmaterialdivider_p.h index d631ad3..cc24b0d 100644 --- a/components/qtmaterialdivider_p.h +++ b/components/qtmaterialdivider_p.h @@ -20,14 +20,6 @@ public: QtMaterialDivider *const q_ptr; int size; -// Material::DividerType type; -// QChar letter; -// QImage image; -// QIcon icon; -// QPixmap pixmap; - bool useThemeColors; -// QColor textColor; -// QColor backgroundColor; }; #endif // QTMATERIALDIVIDER_P_H diff --git a/examples/dividersettingseditor.cpp b/examples/dividersettingseditor.cpp index 232311f..91612ed 100644 --- a/examples/dividersettingseditor.cpp +++ b/examples/dividersettingseditor.cpp @@ -3,6 +3,7 @@ #include #include #include +#include DividerSettingsEditor::DividerSettingsEditor(QWidget *parent) : QWidget(parent), @@ -20,22 +21,30 @@ DividerSettingsEditor::DividerSettingsEditor(QWidget *parent) layout->addWidget(canvas); ui->setupUi(widget); - layout->setContentsMargins(20, 20, 20, 20); +// layout->setContentsMargins(20, 20, 20, 20); + layout->setContentsMargins(0, 0, 0, 0); QLabel *lbl = new QLabel; -lbl->setText( "1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 " ); + lbl->setText( "1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 " ); + + QtMaterialTextField *txt1 = new QtMaterialTextField; + txt1->setLabel( "First Name" ); + txt1->setPlaceholderText( "Placeholder" ); + + QtMaterialTextField *txt2 = new QtMaterialTextField; + txt2->setLabel( "Middle Name" ); + + QtMaterialDivider *div2 = new QtMaterialDivider; + div2->setInsetSize( 40 ); layout = new QVBoxLayout; + layout->setContentsMargins(0, 0, 0, 0); canvas->setLayout(layout); + layout->addWidget(txt1); layout->addWidget(m_divider); - layout->setAlignment(m_divider, Qt::AlignCenter); - m_divider->setSize( canvas->width() ); + layout->addWidget(txt2); + layout->addWidget(div2); layout->addWidget(lbl); - QSizePolicy policy(QSizePolicy::Ignored, - QSizePolicy::Fixed); - lbl->setSizePolicy(policy); - m_divider->setSizePolicy(policy); - setupForm(); From 16c112d16dc35f311f4499b20b0fe4d37a3590b8 Mon Sep 17 00:00:00 2001 From: fperillo Date: Thu, 5 Oct 2017 23:19:00 +0200 Subject: [PATCH 3/4] Divider: one pixel heigth, cleaned up the demo removing the underline of the textfields and removing the padding/spacing of the layout (and a stretch) --- examples/dividersettingseditor.cpp | 36 +++++++++++++----------------- examples/dividersettingseditor.h | 6 ++++- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/examples/dividersettingseditor.cpp b/examples/dividersettingseditor.cpp index 91612ed..16bac89 100644 --- a/examples/dividersettingseditor.cpp +++ b/examples/dividersettingseditor.cpp @@ -3,12 +3,14 @@ #include #include #include -#include DividerSettingsEditor::DividerSettingsEditor(QWidget *parent) : QWidget(parent), ui(new Ui::DividerSettingsForm), - m_divider(new QtMaterialDivider) + m_divider1(new QtMaterialDivider), + m_divider2(new QtMaterialDivider), + m_textfield1(new QtMaterialTextField), + m_textfield2(new QtMaterialTextField) { QVBoxLayout *layout = new QVBoxLayout; setLayout(layout); @@ -21,30 +23,24 @@ DividerSettingsEditor::DividerSettingsEditor(QWidget *parent) layout->addWidget(canvas); ui->setupUi(widget); -// layout->setContentsMargins(20, 20, 20, 20); - layout->setContentsMargins(0, 0, 0, 0); + layout->setContentsMargins(20, 20, 20, 20); +// layout->setContentsMargins(0, 0, 0, 0); - QLabel *lbl = new QLabel; - lbl->setText( "1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 " ); + m_textfield1->setLabel( "First Name" ); + m_textfield1->setPlaceholderText( "Placeholder" ); + m_textfield1->setShowUnderline( false ); - QtMaterialTextField *txt1 = new QtMaterialTextField; - txt1->setLabel( "First Name" ); - txt1->setPlaceholderText( "Placeholder" ); - - QtMaterialTextField *txt2 = new QtMaterialTextField; - txt2->setLabel( "Middle Name" ); - - QtMaterialDivider *div2 = new QtMaterialDivider; - div2->setInsetSize( 40 ); + m_textfield2->setLabel( "Middle Name" ); + m_textfield2->setShowUnderline( false ); layout = new QVBoxLayout; layout->setContentsMargins(0, 0, 0, 0); canvas->setLayout(layout); - layout->addWidget(txt1); - layout->addWidget(m_divider); - layout->addWidget(txt2); - layout->addWidget(div2); - layout->addWidget(lbl); + layout->addWidget(m_textfield1); + layout->addWidget(m_divider1); + layout->addWidget(m_textfield2); + layout->addWidget(m_divider2); + layout->addStretch(); setupForm(); diff --git a/examples/dividersettingseditor.h b/examples/dividersettingseditor.h index 96c10a5..6f7dfd6 100644 --- a/examples/dividersettingseditor.h +++ b/examples/dividersettingseditor.h @@ -3,6 +3,7 @@ #include #include "ui_dividersettingsform.h" +#include class QtMaterialDivider; @@ -20,7 +21,10 @@ protected slots: private: Ui::DividerSettingsForm *const ui; - QtMaterialDivider *const m_divider; + QtMaterialDivider *const m_divider1; + QtMaterialDivider *const m_divider2; + QtMaterialTextField *const m_textfield1; + QtMaterialTextField *const m_textfield2; }; #endif // DIVIDERSETTINGSEDITOR_H From fa68cb5118453d68f59e767b8301b6394a4b144a Mon Sep 17 00:00:00 2001 From: fperillo Date: Thu, 5 Oct 2017 23:56:31 +0200 Subject: [PATCH 4/4] missing file --- components/qtmaterialdivider.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/qtmaterialdivider.cpp b/components/qtmaterialdivider.cpp index cc7e35e..66fa690 100644 --- a/components/qtmaterialdivider.cpp +++ b/components/qtmaterialdivider.cpp @@ -34,8 +34,8 @@ void QtMaterialDividerPrivate::init() QSizePolicy policy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed); - q->setMinimumHeight( 4 ); - q->setMaximumHeight( 14 ); + q->setMinimumHeight( 1 ); + q->setMaximumHeight( 1 ); } /*!