scrap old style file

This commit is contained in:
laserpants 2016-04-30 12:53:58 +03:00
parent 81c65341d7
commit d92292e302
6 changed files with 171 additions and 171 deletions

View File

@ -2,7 +2,7 @@
#include <QEvent> #include <QEvent>
#include <QHeaderView> #include <QHeaderView>
#include "table.h" #include "table.h"
#include "style.h" #include "lib/style.h"
Table::Table(QWidget *parent) Table::Table(QWidget *parent)
: QTableWidget(parent) : QTableWidget(parent)

View File

@ -3,7 +3,7 @@
#include <QPainter> #include <QPainter>
#include <QDebug> #include <QDebug>
#include "textfield.h" #include "textfield.h"
#include "style.h" #include "lib/style.h"
TextField::TextField(QWidget *parent) TextField::TextField(QWidget *parent)
: QLineEdit(parent), : QLineEdit(parent),

View File

@ -1,8 +1,8 @@
#include <QPainter> #include <QPainter>
#include <QStyleOption> #include <QStyleOption>
#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) switch (pe)
{ {

View File

@ -9,7 +9,6 @@ TEMPLATE = app
SOURCES += main.cpp\ SOURCES += main.cpp\
mainwindow.cpp \ mainwindow.cpp \
style.cpp \
components/appbar.cpp \ components/appbar.cpp \
components/checkbox.cpp \ components/checkbox.cpp \
components/dialog.cpp \ components/dialog.cpp \
@ -54,7 +53,6 @@ SOURCES += main.cpp\
lib/style.cpp lib/style.cpp
HEADERS += mainwindow.h \ HEADERS += mainwindow.h \
style.h \
components/appbar.h \ components/appbar.h \
components/checkbox.h \ components/checkbox.h \
components/dialog.h \ components/dialog.h \
@ -94,9 +92,9 @@ HEADERS += mainwindow.h \
examples/menuexamples.h \ examples/menuexamples.h \
components/menu.h \ components/menu.h \
components/scrollbar.h \ components/scrollbar.h \
lib/style.h \
examples/iconmenuexamples.h \ examples/iconmenuexamples.h \
lib/scaleeffect.h lib/scaleeffect.h \
lib/style.h
RESOURCES += \ RESOURCES += \
resources.qrc resources.qrc

253
style.cpp
View File

@ -1,126 +1,127 @@
#include <QDebug> // #include <QDebug>
#include <QPainter> // #include <QPainter>
#include <QStyleOption> // #include <QStyleOption>
#include <QStyleOptionButton> // #include <QStyleOptionButton>
#include "style.h" // #include "style.h"
//
void Style::drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, QPainter *p, // void Style::drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, QPainter *p,
const QWidget *w) const // const QWidget *w) const
{ // {
qDebug() << pe; // qDebug() << pe;
//
switch (pe) { // switch (pe) {
case PE_FrameFocusRect: // case PE_FrameFocusRect:
p->setPen(Qt::blue); // p->setPen(Qt::blue);
p->drawRect(opt->rect.adjusted(0, 0, -1, -1)); // p->drawRect(opt->rect.adjusted(0, 0, -1, -1));
break; // break;
default: // default:
QCommonStyle::drawPrimitive(pe, opt, p, w); // QCommonStyle::drawPrimitive(pe, opt, p, w);
} // }
} // }
//
void Style::drawControl(ControlElement element, const QStyleOption *opt, // void Style::drawControl(ControlElement element, const QStyleOption *opt,
QPainter *p, const QWidget *widget) const // QPainter *p, const QWidget *widget) const
{ // {
// qDebug() << element; // // qDebug() << element;
//
switch (element) { // switch (element) {
/* // /*
case CE_CheckBox: // case CE_CheckBox:
if (const QStyleOptionButton *item = qstyleoption_cast<const QStyleOptionButton *>(opt)) { // if (const QStyleOptionButton *item = qstyleoption_cast<const QStyleOptionButton *>(opt)) {
//
} // }
p->fillRect(opt->rect, Qt::black); // p->fillRect(opt->rect, Qt::black);
break; // break;
*/ // */
/* // /*
case CE_FocusFrame: // case CE_FocusFrame:
p->fillRect(opt->rect, opt->palette.foreground()); // p->fillRect(opt->rect, opt->palette.foreground());
break; // break;
case CE_MenuItem: // case CE_MenuItem:
if (const QStyleOptionMenuItem *item = qstyleoption_cast<const QStyleOptionMenuItem *>(opt)) { // if (const QStyleOptionMenuItem *item = qstyleoption_cast<const QStyleOptionMenuItem *>(opt)) {
p->drawText(item->rect, item->text); // p->drawText(item->rect, item->text);
} // }
break; // break;
*/ // */
default: // default:
QCommonStyle::drawControl(element, opt, p, widget); // QCommonStyle::drawControl(element, opt, p, widget);
} // }
} // }
//
QRect Style::subElementRect(SubElement sr, const QStyleOption *opt, // QRect Style::subElementRect(SubElement sr, const QStyleOption *opt,
const QWidget *widget) const // const QWidget *widget) const
{ // {
// qDebug() << "subElementRect : " << sr; // // qDebug() << "subElementRect : " << sr;
// qDebug() << "-----------------------------------------------"; // // qDebug() << "-----------------------------------------------";
//
QRect r; // QRect r;
switch (sr) { // switch (sr) {
case SE_PushButtonFocusRect: // case SE_PushButtonFocusRect:
if (const QStyleOptionButton *btn = qstyleoption_cast<const QStyleOptionButton *>(opt)) { // if (const QStyleOptionButton *btn = qstyleoption_cast<const QStyleOptionButton *>(opt)) {
r.setRect(btn->rect.x(), btn->rect.y(), btn->rect.width() - 1, btn->rect.height() - 1); // r.setRect(btn->rect.x(), btn->rect.y(), btn->rect.width() - 1, btn->rect.height() - 1);
r = visualRect(opt->direction, opt->rect, r); // r = visualRect(opt->direction, opt->rect, r);
} // }
break; // break;
default: // default:
r = QCommonStyle::subElementRect(sr, opt, widget); // r = QCommonStyle::subElementRect(sr, opt, widget);
} // }
//
// qDebug() << "r = " << r; // // qDebug() << "r = " << r;
// qDebug() << "==============================================="; // // qDebug() << "===============================================";
//
return r; // return r;
} // }
//
void Style::drawComplexControl(ComplexControl cc, const QStyleOptionComplex *opt, QPainter *p, // void Style::drawComplexControl(ComplexControl cc, const QStyleOptionComplex *opt, QPainter *p,
const QWidget *w) const // const QWidget *w) const
{ // {
// qDebug() << "drawComplexControl : " << cc; // // qDebug() << "drawComplexControl : " << cc;
// qDebug() << "==============================================="; // // qDebug() << "===============================================";
//
switch (cc) { // switch (cc) {
default: // default:
QCommonStyle::drawComplexControl(cc, opt, p, w); // QCommonStyle::drawComplexControl(cc, opt, p, w);
} // }
} // }
//
QRect Style::subControlRect(ComplexControl cc, const QStyleOptionComplex *opt, SubControl sc, // QRect Style::subControlRect(ComplexControl cc, const QStyleOptionComplex *opt, SubControl sc,
const QWidget *w) const // const QWidget *w) const
{ // {
// qDebug() << "subControlRect : " << cc; // // qDebug() << "subControlRect : " << cc;
// qDebug() << "------------------------------------------------"; // // qDebug() << "------------------------------------------------";
//
QRect r; // QRect r;
switch (cc) { // switch (cc) {
default: // default:
r = QCommonStyle::subControlRect(cc, opt, sc, w); // r = QCommonStyle::subControlRect(cc, opt, sc, w);
} // }
//
// qDebug() << "r = " << r; // // qDebug() << "r = " << r;
// qDebug() << "==============================================="; // // qDebug() << "===============================================";
//
return r; // return r;
} // }
//
int Style::pixelMetric(PixelMetric m, const QStyleOption *opt, const QWidget *widget) const // int Style::pixelMetric(PixelMetric m, const QStyleOption *opt, const QWidget *widget) const
{ // {
// qDebug() << "pixelMetric : " << m; // // qDebug() << "pixelMetric : " << m;
// qDebug() << "-----------------------------------------------"; // // qDebug() << "-----------------------------------------------";
//
int ret; // int ret;
//
switch (m) { // switch (m) {
case PM_FocusFrameVMargin: // case PM_FocusFrameVMargin:
case PM_FocusFrameHMargin: // case PM_FocusFrameHMargin:
case PM_DefaultFrameWidth: // case PM_DefaultFrameWidth:
ret = 0; // ret = 0;
break; // break;
default: // default:
ret = QCommonStyle::pixelMetric(m, opt, widget); // ret = QCommonStyle::pixelMetric(m, opt, widget);
} // }
//
// qDebug() << "ret = " << ret; // // qDebug() << "ret = " << ret;
// qDebug() << "==============================================="; // // qDebug() << "===============================================";
//
return ret; // return ret;
} // }
//

75
style.h
View File

@ -1,37 +1,38 @@
#ifndef STYLE_H // #ifndef STYLE_H
#define STYLE_H // #define STYLE_H
//
#include <QCommonStyle> // #include <QCommonStyle>
//
class Style : public QCommonStyle // class Style : public QCommonStyle
{ // {
Q_OBJECT // Q_OBJECT
//
public: // public:
static Style &instance() // static Style &instance()
{ // {
static Style instance; // static Style instance;
return instance; // return instance;
} // }
//
void drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, QPainter *p, // void drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, QPainter *p,
const QWidget *w = 0) const Q_DECL_OVERRIDE; // const QWidget *w = 0) const Q_DECL_OVERRIDE;
void drawControl(ControlElement element, const QStyleOption *opt, QPainter *p, // void drawControl(ControlElement element, const QStyleOption *opt, QPainter *p,
const QWidget *w = 0) const Q_DECL_OVERRIDE; // const QWidget *w = 0) const Q_DECL_OVERRIDE;
//
QRect subElementRect(SubElement r, const QStyleOption *opt, const QWidget *widget = 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, // void drawComplexControl(ComplexControl cc, const QStyleOptionComplex *opt, QPainter *p,
const QWidget *w = 0) const Q_DECL_OVERRIDE; // const QWidget *w = 0) const Q_DECL_OVERRIDE;
QRect subControlRect(ComplexControl cc, const QStyleOptionComplex *opt, SubControl sc, // QRect subControlRect(ComplexControl cc, const QStyleOptionComplex *opt, SubControl sc,
const QWidget *w = 0) const Q_DECL_OVERRIDE; // const QWidget *w = 0) const Q_DECL_OVERRIDE;
//
int pixelMetric(PixelMetric m, const QStyleOption *opt = 0, const QWidget *widget = 0) const Q_DECL_OVERRIDE; // int pixelMetric(PixelMetric m, const QStyleOption *opt = 0, const QWidget *widget = 0) const Q_DECL_OVERRIDE;
//
private: // private:
Style() {} // Style() {}
//
Style(Style const&); // Style(Style const&);
void operator=(Style const&); // void operator=(Style const&);
}; // };
//
#endif // STYLE_H // #endif // STYLE_H
//