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

add flat button internal class

This commit is contained in:
laserpants 2016-05-15 10:08:23 +03:00
parent 80d5e0acb6
commit e646cc0332
7 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/flatbutton.cpp
View File

@ -103,7 +103,7 @@ void FlatButton::mousePressEvent(QMouseEvent *event)
ripple->setOpacityStartValue(0.2);
ripple->setColor(d->textColor());
d->ripple->addRipple(ripple);
//d->ripple->addRipple(ripple);
QPushButton::mousePressEvent(event);
}

1
components/flatbutton_internal.cpp Normal file
View File

@ -0,0 +1 @@
#include "flatbutton_internal.h"

4
components/flatbutton_internal.h Normal file
View File

@ -0,0 +1,4 @@
#ifndef FLATBUTTON_INTERNAL_H
#define FLATBUTTON_INTERNAL_H
#endif // FLATBUTTON_INTERNAL_H

12
components/flatbutton_p.h
View File

@ -1,6 +1,7 @@
#ifndef FLATBUTTON_P_H
#define FLATBUTTON_P_H
#include <QStateMachine>
#include "flatbutton.h"
#include "lib/rippleoverlay.h"
#include "lib/theme.h"
@ -19,6 +20,7 @@ public:
FlatButton *const q_ptr;
RippleOverlay *const ripple;
QStateMachine machine;
Material::Role role;
};
@ -43,6 +45,16 @@ FlatButtonPrivate::FlatButtonPrivate(FlatButton *parent)
palette.setColor(QPalette::Disabled, QPalette::ButtonText,
style.themeColor("disabled"));
parent->setPalette(palette);
QState *normalState = new QState;
QState *focusedState = new QState;
QState *pressedState = new QState;
machine.addState(normalState);
machine.addState(focusedState);
machine.addState(pressedState);
machine.setInitialState(normalState);
}
QColor FlatButtonPrivate::textColor() const

2
components/sliderinternal.cpp → components/slider_internal.cpp
View File

@ -1,4 +1,4 @@
#include "sliderinternal.h"
#include "slider_internal.h"
#include <QEvent>
#include <QPainter>
#include <QDebug>

0
components/sliderinternal.h → components/slider_internal.h
View File

8
qt-material-widgets.pro
View File

@ -53,7 +53,8 @@ SOURCES += main.cpp\
lib/style.cpp \
components/searchfield.cpp \
lib/theme.cpp \
components/sliderinternal.cpp
components/slider_internal.cpp \
components/flatbutton_internal.cpp
HEADERS += mainwindow.h \
components/appbar.h \
@ -102,8 +103,9 @@ HEADERS += mainwindow.h \
components/searchfield.h \
lib/theme.h \
lib/theme_p.h \
components/sliderinternal.h \
components/flatbutton_p.h
components/flatbutton_p.h \
components/slider_internal.h \
components/flatbutton_internal.h
RESOURCES += \
resources.qrc