From d92292e302d1c1cf757f5f2dfcaf02a054420dfd Mon Sep 17 00:00:00 2001 From: laserpants Date: Sat, 30 Apr 2016 12:53:58 +0300 Subject: [PATCH] scrap old style file --- components/table.cpp | 2 +- components/textfield.cpp | 2 +- lib/style.cpp | 4 +- qt-material-widgets.pro | 6 +- style.cpp | 253 ++++++++++++++++++++------------------- style.h | 75 ++++++------ 6 files changed, 171 insertions(+), 171 deletions(-) diff --git a/components/table.cpp b/components/table.cpp index 5496f92..d7d2b38 100644 --- a/components/table.cpp +++ b/components/table.cpp @@ -2,7 +2,7 @@ #include #include #include "table.h" -#include "style.h" +#include "lib/style.h" Table::Table(QWidget *parent) : QTableWidget(parent) diff --git a/components/textfield.cpp b/components/textfield.cpp index 07e59e9..8366497 100644 --- a/components/textfield.cpp +++ b/components/textfield.cpp @@ -3,7 +3,7 @@ #include #include #include "textfield.h" -#include "style.h" +#include "lib/style.h" TextField::TextField(QWidget *parent) : QLineEdit(parent), diff --git a/lib/style.cpp b/lib/style.cpp index 39649bb..a52bf69 100644 --- a/lib/style.cpp +++ b/lib/style.cpp @@ -1,8 +1,8 @@ #include #include -#include "style.h" +#include "lib/style.h" -void Style::drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, QPainter *p, const QWidget *w = 0) const +void Style::drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, QPainter *p, const QWidget *w) const { switch (pe) { diff --git a/qt-material-widgets.pro b/qt-material-widgets.pro index f3ef34b..96dabef 100644 --- a/qt-material-widgets.pro +++ b/qt-material-widgets.pro @@ -9,7 +9,6 @@ TEMPLATE = app SOURCES += main.cpp\ mainwindow.cpp \ - style.cpp \ components/appbar.cpp \ components/checkbox.cpp \ components/dialog.cpp \ @@ -54,7 +53,6 @@ SOURCES += main.cpp\ lib/style.cpp HEADERS += mainwindow.h \ - style.h \ components/appbar.h \ components/checkbox.h \ components/dialog.h \ @@ -94,9 +92,9 @@ HEADERS += mainwindow.h \ examples/menuexamples.h \ components/menu.h \ components/scrollbar.h \ - lib/style.h \ examples/iconmenuexamples.h \ - lib/scaleeffect.h + lib/scaleeffect.h \ + lib/style.h RESOURCES += \ resources.qrc diff --git a/style.cpp b/style.cpp index 71bdb28..2d71d14 100644 --- a/style.cpp +++ b/style.cpp @@ -1,126 +1,127 @@ -#include -#include -#include -#include -#include "style.h" - -void Style::drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, QPainter *p, - const QWidget *w) const -{ - qDebug() << pe; - - switch (pe) { - case PE_FrameFocusRect: - p->setPen(Qt::blue); - p->drawRect(opt->rect.adjusted(0, 0, -1, -1)); - break; - default: - QCommonStyle::drawPrimitive(pe, opt, p, w); - } -} - -void Style::drawControl(ControlElement element, const QStyleOption *opt, - QPainter *p, const QWidget *widget) const -{ -// qDebug() << element; - - switch (element) { - /* - case CE_CheckBox: - if (const QStyleOptionButton *item = qstyleoption_cast(opt)) { - - } - p->fillRect(opt->rect, Qt::black); - break; - */ - /* - case CE_FocusFrame: - p->fillRect(opt->rect, opt->palette.foreground()); - break; - case CE_MenuItem: - if (const QStyleOptionMenuItem *item = qstyleoption_cast(opt)) { - p->drawText(item->rect, item->text); - } - break; - */ - default: - QCommonStyle::drawControl(element, opt, p, widget); - } -} - -QRect Style::subElementRect(SubElement sr, const QStyleOption *opt, - const QWidget *widget) const -{ -// qDebug() << "subElementRect : " << sr; -// qDebug() << "-----------------------------------------------"; - - QRect r; - switch (sr) { - case SE_PushButtonFocusRect: - if (const QStyleOptionButton *btn = qstyleoption_cast(opt)) { - r.setRect(btn->rect.x(), btn->rect.y(), btn->rect.width() - 1, btn->rect.height() - 1); - r = visualRect(opt->direction, opt->rect, r); - } - break; - default: - r = QCommonStyle::subElementRect(sr, opt, widget); - } - -// qDebug() << "r = " << r; -// qDebug() << "==============================================="; - - return r; -} - -void Style::drawComplexControl(ComplexControl cc, const QStyleOptionComplex *opt, QPainter *p, - const QWidget *w) const -{ -// qDebug() << "drawComplexControl : " << cc; -// qDebug() << "==============================================="; - - switch (cc) { - default: - QCommonStyle::drawComplexControl(cc, opt, p, w); - } -} - -QRect Style::subControlRect(ComplexControl cc, const QStyleOptionComplex *opt, SubControl sc, - const QWidget *w) const -{ -// qDebug() << "subControlRect : " << cc; -// qDebug() << "------------------------------------------------"; - - QRect r; - switch (cc) { - default: - r = QCommonStyle::subControlRect(cc, opt, sc, w); - } - -// qDebug() << "r = " << r; -// qDebug() << "==============================================="; - - return r; -} - -int Style::pixelMetric(PixelMetric m, const QStyleOption *opt, const QWidget *widget) const -{ -// qDebug() << "pixelMetric : " << m; -// qDebug() << "-----------------------------------------------"; - - int ret; - - switch (m) { - case PM_FocusFrameVMargin: - case PM_FocusFrameHMargin: - case PM_DefaultFrameWidth: - ret = 0; - break; - default: - ret = QCommonStyle::pixelMetric(m, opt, widget); - } - -// qDebug() << "ret = " << ret; -// qDebug() << "==============================================="; - - return ret; -} +// #include +// #include +// #include +// #include +// #include "style.h" +// +// void Style::drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, QPainter *p, +// const QWidget *w) const +// { +// qDebug() << pe; +// +// switch (pe) { +// case PE_FrameFocusRect: +// p->setPen(Qt::blue); +// p->drawRect(opt->rect.adjusted(0, 0, -1, -1)); +// break; +// default: +// QCommonStyle::drawPrimitive(pe, opt, p, w); +// } +// } +// +// void Style::drawControl(ControlElement element, const QStyleOption *opt, +// QPainter *p, const QWidget *widget) const +// { +// // qDebug() << element; +// +// switch (element) { +// /* +// case CE_CheckBox: +// if (const QStyleOptionButton *item = qstyleoption_cast(opt)) { +// +// } +// p->fillRect(opt->rect, Qt::black); +// break; +// */ +// /* +// case CE_FocusFrame: +// p->fillRect(opt->rect, opt->palette.foreground()); +// break; +// case CE_MenuItem: +// if (const QStyleOptionMenuItem *item = qstyleoption_cast(opt)) { +// p->drawText(item->rect, item->text); +// } +// break; +// */ +// default: +// QCommonStyle::drawControl(element, opt, p, widget); +// } +// } +// +// QRect Style::subElementRect(SubElement sr, const QStyleOption *opt, +// const QWidget *widget) const +// { +// // qDebug() << "subElementRect : " << sr; +// // qDebug() << "-----------------------------------------------"; +// +// QRect r; +// switch (sr) { +// case SE_PushButtonFocusRect: +// if (const QStyleOptionButton *btn = qstyleoption_cast(opt)) { +// r.setRect(btn->rect.x(), btn->rect.y(), btn->rect.width() - 1, btn->rect.height() - 1); +// r = visualRect(opt->direction, opt->rect, r); +// } +// break; +// default: +// r = QCommonStyle::subElementRect(sr, opt, widget); +// } +// +// // qDebug() << "r = " << r; +// // qDebug() << "==============================================="; +// +// return r; +// } +// +// void Style::drawComplexControl(ComplexControl cc, const QStyleOptionComplex *opt, QPainter *p, +// const QWidget *w) const +// { +// // qDebug() << "drawComplexControl : " << cc; +// // qDebug() << "==============================================="; +// +// switch (cc) { +// default: +// QCommonStyle::drawComplexControl(cc, opt, p, w); +// } +// } +// +// QRect Style::subControlRect(ComplexControl cc, const QStyleOptionComplex *opt, SubControl sc, +// const QWidget *w) const +// { +// // qDebug() << "subControlRect : " << cc; +// // qDebug() << "------------------------------------------------"; +// +// QRect r; +// switch (cc) { +// default: +// r = QCommonStyle::subControlRect(cc, opt, sc, w); +// } +// +// // qDebug() << "r = " << r; +// // qDebug() << "==============================================="; +// +// return r; +// } +// +// int Style::pixelMetric(PixelMetric m, const QStyleOption *opt, const QWidget *widget) const +// { +// // qDebug() << "pixelMetric : " << m; +// // qDebug() << "-----------------------------------------------"; +// +// int ret; +// +// switch (m) { +// case PM_FocusFrameVMargin: +// case PM_FocusFrameHMargin: +// case PM_DefaultFrameWidth: +// ret = 0; +// break; +// default: +// ret = QCommonStyle::pixelMetric(m, opt, widget); +// } +// +// // qDebug() << "ret = " << ret; +// // qDebug() << "==============================================="; +// +// return ret; +// } +// diff --git a/style.h b/style.h index deb830e..e909741 100644 --- a/style.h +++ b/style.h @@ -1,37 +1,38 @@ -#ifndef STYLE_H -#define STYLE_H - -#include - -class Style : public QCommonStyle -{ - Q_OBJECT - -public: - static Style &instance() - { - static Style instance; - return instance; - } - - void drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, QPainter *p, - const QWidget *w = 0) const Q_DECL_OVERRIDE; - void drawControl(ControlElement element, const QStyleOption *opt, QPainter *p, - const QWidget *w = 0) const Q_DECL_OVERRIDE; - - QRect subElementRect(SubElement r, const QStyleOption *opt, const QWidget *widget = 0) const Q_DECL_OVERRIDE; - void drawComplexControl(ComplexControl cc, const QStyleOptionComplex *opt, QPainter *p, - const QWidget *w = 0) const Q_DECL_OVERRIDE; - QRect subControlRect(ComplexControl cc, const QStyleOptionComplex *opt, SubControl sc, - const QWidget *w = 0) const Q_DECL_OVERRIDE; - - int pixelMetric(PixelMetric m, const QStyleOption *opt = 0, const QWidget *widget = 0) const Q_DECL_OVERRIDE; - -private: - Style() {} - - Style(Style const&); - void operator=(Style const&); -}; - -#endif // STYLE_H +// #ifndef STYLE_H +// #define STYLE_H +// +// #include +// +// class Style : public QCommonStyle +// { +// Q_OBJECT +// +// public: +// static Style &instance() +// { +// static Style instance; +// return instance; +// } +// +// void drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, QPainter *p, +// const QWidget *w = 0) const Q_DECL_OVERRIDE; +// void drawControl(ControlElement element, const QStyleOption *opt, QPainter *p, +// const QWidget *w = 0) const Q_DECL_OVERRIDE; +// +// QRect subElementRect(SubElement r, const QStyleOption *opt, const QWidget *widget = 0) const Q_DECL_OVERRIDE; +// void drawComplexControl(ComplexControl cc, const QStyleOptionComplex *opt, QPainter *p, +// const QWidget *w = 0) const Q_DECL_OVERRIDE; +// QRect subControlRect(ComplexControl cc, const QStyleOptionComplex *opt, SubControl sc, +// const QWidget *w = 0) const Q_DECL_OVERRIDE; +// +// int pixelMetric(PixelMetric m, const QStyleOption *opt = 0, const QWidget *widget = 0) const Q_DECL_OVERRIDE; +// +// private: +// Style() {} +// +// Style(Style const&); +// void operator=(Style const&); +// }; +// +// #endif // STYLE_H +//