From 5cd3a0bdf66e1811336a6ad5ebf76ec1c7cb389b Mon Sep 17 00:00:00 2001 From: johanneshilden Date: Sat, 30 Sep 2017 01:36:16 +0300 Subject: [PATCH] Remove Menu Item --- components/components.pro | 5 - components/qtmaterialmenuitem.cpp | 115 --------------------- components/qtmaterialmenuitem.h | 27 ----- components/qtmaterialmenuitem_internal.cpp | 50 --------- components/qtmaterialmenuitem_internal.h | 47 --------- components/qtmaterialmenuitem_p.h | 23 ----- 6 files changed, 267 deletions(-) delete mode 100644 components/qtmaterialmenuitem.cpp delete mode 100644 components/qtmaterialmenuitem.h delete mode 100644 components/qtmaterialmenuitem_internal.cpp delete mode 100644 components/qtmaterialmenuitem_internal.h delete mode 100644 components/qtmaterialmenuitem_p.h diff --git a/components/components.pro b/components/components.pro index c563735..2fe999e 100644 --- a/components/components.pro +++ b/components/components.pro @@ -30,8 +30,6 @@ SOURCES = \ qtmaterialtextfield.cpp \ qtmaterialtabs_internal.cpp \ qtmaterialtabs.cpp \ - qtmaterialmenuitem_internal.cpp \ - qtmaterialmenuitem.cpp \ qtmaterialscrollbar_internal.cpp \ qtmaterialscrollbar.cpp HEADERS = \ @@ -82,9 +80,6 @@ HEADERS = \ qtmaterialtabs_internal.h \ qtmaterialtabs_p.h \ qtmaterialtabs.h \ - qtmaterialmenuitem_internal.h \ - qtmaterialmenuitem_p.h \ - qtmaterialmenuitem.h \ qtmaterialscrollbar_internal.h \ qtmaterialscrollbar_p.h \ qtmaterialscrollbar.h diff --git a/components/qtmaterialmenuitem.cpp b/components/qtmaterialmenuitem.cpp deleted file mode 100644 index 1a4a46c..0000000 --- a/components/qtmaterialmenuitem.cpp +++ /dev/null @@ -1,115 +0,0 @@ -#include "qtmaterialmenuitem.h" -#include "qtmaterialmenuitem_p.h" -#include -#include "qtmaterialmenuitem_internal.h" -#include "lib/qtmaterialstyle.h" - -/*! - * \class QtMaterialMenuItemPrivate - * \internal - */ - -/*! - * \internal - */ -QtMaterialMenuItemPrivate::QtMaterialMenuItemPrivate(QtMaterialMenuItem *q) - : QtMaterialFlatButtonPrivate(q) -{ -} - -/*! - * \internal - */ -QtMaterialMenuItemPrivate::~QtMaterialMenuItemPrivate() -{ -} - -/*! - * \internal - */ -void QtMaterialMenuItemPrivate::init() -{ - Q_Q(QtMaterialMenuItem); - - highlighted = false; - - QFont font(q->font()); - font.setCapitalization(QFont::MixedCase); - font.setPointSize(11); - font.setStyleName("Regular"); - q->setFont(font); - - q->setOverlayStyle(Material::GrayOverlay); - q->setForegroundColor(QtMaterialStyle::instance().themeColor("text")); - q->setCornerRadius(0); -} - -/*! - * \class QtMaterialMenuItem - */ - -QtMaterialMenuItem::QtMaterialMenuItem(QWidget *parent) - : QtMaterialFlatButton(*new QtMaterialMenuItemPrivate(this), parent) -{ - d_func()->init(); -} - -QtMaterialMenuItem::~QtMaterialMenuItem() -{ -} - -void QtMaterialMenuItem::setHighlighted(bool value) -{ - Q_D(QtMaterialMenuItem); - - d->highlighted = value; -} - -bool QtMaterialMenuItem::isHighlighted() const -{ - Q_D(const QtMaterialMenuItem); - - return d->highlighted; -} - -void QtMaterialMenuItem::paintForeground(QPainter *painter) -{ - if (isEnabled()) { - painter->setPen(foregroundColor()); - } else { - painter->setPen(disabledForegroundColor()); - } - - QRect r(rect()); - - if (icon().isNull()) { - painter->drawText(r.marginsRemoved(QMargins(14, 0, 14, 0)), - Qt::AlignVCenter | Qt::AlignLeft, - text()); - return; - } - - QSize textSize(fontMetrics().size(Qt::TextSingleLine, text())); - QSize base(size()-textSize); - - const int iw = iconSize().width() + IconPadding; - - QRect textGeometry(QPoint(14, base.height()/2), textSize); - QRect iconGeometry(QPoint(14, (height()-iconSize().height())/2), iconSize()); - - if (Material::LeftIcon == iconPlacement()) { - textGeometry.translate(iw, 0); - } else { - iconGeometry.translate(textSize.width() + IconPadding, 0); - } - - painter->drawText(textGeometry, - Qt::AlignVCenter | Qt::AlignLeft, - text()); - - QPixmap pixmap = icon().pixmap(iconSize()); - QPainter icon(&pixmap); - icon.setCompositionMode(QPainter::CompositionMode_SourceIn); - icon.fillRect(pixmap.rect(), painter->pen().color()); - painter->drawPixmap(iconGeometry, pixmap); -} diff --git a/components/qtmaterialmenuitem.h b/components/qtmaterialmenuitem.h deleted file mode 100644 index 23fe020..0000000 --- a/components/qtmaterialmenuitem.h +++ /dev/null @@ -1,27 +0,0 @@ -#ifndef QTMATERIALMENUITEM_H -#define QTMATERIALMENUITEM_H - -#include "qtmaterialflatbutton.h" - -class QtMaterialMenuItemPrivate; - -class QtMaterialMenuItem : public QtMaterialFlatButton -{ - Q_OBJECT - -public: - explicit QtMaterialMenuItem(QWidget *parent = 0); - ~QtMaterialMenuItem(); - - void setHighlighted(bool value); - bool isHighlighted() const; - -protected: - void paintForeground(QPainter *painter) Q_DECL_OVERRIDE; - -private: - Q_DISABLE_COPY(QtMaterialMenuItem) - Q_DECLARE_PRIVATE(QtMaterialMenuItem) -}; - -#endif // QTMATERIALMENUITEM_H diff --git a/components/qtmaterialmenuitem_internal.cpp b/components/qtmaterialmenuitem_internal.cpp deleted file mode 100644 index 6a8c287..0000000 --- a/components/qtmaterialmenuitem_internal.cpp +++ /dev/null @@ -1,50 +0,0 @@ -#include "qtmaterialmenuitem_internal.h" -#include -#include - -/*! - * \class QtMaterialMenuItemStateMachine - * \internal - */ - -/*! - * \internal - */ -QtMaterialMenuItemStateMachine::QtMaterialMenuItemStateMachine(QtMaterialMenuItem *menuItem) - : QStateMachine(menuItem), - m_menuItem(menuItem), - m_defaultState(new QState), - m_highlightedState(new QState) -{ - Q_ASSERT(menuItem); - - addState(m_defaultState); - addState(m_highlightedState); - - setInitialState(m_defaultState); - - QSignalTransition *transition; - - transition = new QSignalTransition(this, SIGNAL(highlight())); - transition->setTargetState(m_highlightedState); - m_defaultState->addTransition(transition); - - transition = new QSignalTransition(this, SIGNAL(unhighlight())); - transition->setTargetState(m_defaultState); - m_highlightedState->addTransition(transition); - - QPropertyAnimation *animation; - - animation = new QPropertyAnimation(this); - animation->setTargetObject(this); - animation->setPropertyName("foregroundColor"); - animation->setDuration(160); - addDefaultAnimation(animation); -} - -/*! - * \internal - */ -QtMaterialMenuItemStateMachine::~QtMaterialMenuItemStateMachine() -{ -} diff --git a/components/qtmaterialmenuitem_internal.h b/components/qtmaterialmenuitem_internal.h deleted file mode 100644 index 5733406..0000000 --- a/components/qtmaterialmenuitem_internal.h +++ /dev/null @@ -1,47 +0,0 @@ -#ifndef QTMATERIALMENUITEM_INTERNAL_H -#define QTMATERIALMENUITEM_INTERNAL_H - -#include -#include -#include "qtmaterialmenuitem.h" - -class QtMaterialMenuItem; - -class QtMaterialMenuItemStateMachine : public QStateMachine -{ - Q_OBJECT - - Q_PROPERTY(QColor foregroundColor READ foregroundColor WRITE setForegroundColor) - -public: - explicit QtMaterialMenuItemStateMachine(QtMaterialMenuItem *menuItem); - ~QtMaterialMenuItemStateMachine(); - - inline void setForegroundColor(const QColor &color); - inline QColor foregroundColor() const; - -signals: - void highlight(); - void unhighlight(); - -private: - Q_DISABLE_COPY(QtMaterialMenuItemStateMachine) - - QtMaterialMenuItem *const m_menuItem; - QState *const m_defaultState; - QState *const m_highlightedState; - QColor m_foregroundColor; -}; - -inline void QtMaterialMenuItemStateMachine::setForegroundColor(const QColor &color) -{ - m_foregroundColor = color; - m_menuItem->update(); -} - -inline QColor QtMaterialMenuItemStateMachine::foregroundColor() const -{ - return m_foregroundColor; -} - -#endif // QTMATERIALMENUITEM_INTERNAL_H diff --git a/components/qtmaterialmenuitem_p.h b/components/qtmaterialmenuitem_p.h deleted file mode 100644 index d60ec3a..0000000 --- a/components/qtmaterialmenuitem_p.h +++ /dev/null @@ -1,23 +0,0 @@ -#ifndef QTMATERIALMENUITEM_P_H -#define QTMATERIALMENUITEM_P_H - -#include "qtmaterialflatbutton_p.h" - -class QtMaterialMenuItem; -class QtMaterialMenuItemStateMachine; - -class QtMaterialMenuItemPrivate : public QtMaterialFlatButtonPrivate -{ - Q_DISABLE_COPY(QtMaterialMenuItemPrivate) - Q_DECLARE_PUBLIC(QtMaterialMenuItem) - -public: - QtMaterialMenuItemPrivate(QtMaterialMenuItem *q); - ~QtMaterialMenuItemPrivate(); - - void init(); - - bool highlighted; -}; - -#endif // QTMATERIALMENUITEM_P_H