diff options
Diffstat (limited to 'src/kernel/qstyle.h')
| -rw-r--r-- | src/kernel/qstyle.h | 71 |
1 files changed, 48 insertions, 23 deletions
diff --git a/src/kernel/qstyle.h b/src/kernel/qstyle.h index 2d76d09..1d20b8c 100644 --- a/src/kernel/qstyle.h +++ b/src/kernel/qstyle.h @@ -63,26 +63,26 @@ class QStyleOption { public: enum StyleOptionDefault { Default }; - QStyleOption(StyleOptionDefault=Default) : def(TRUE), tb(NULL), cli(NULL) {} + QStyleOption(StyleOptionDefault=Default) : def(TRUE), tb(NULL), cli(NULL), tbh(NULL) {} // Note: we don't use default arguments since that is unnecessary // initialization. QStyleOption(int in1) : - def(FALSE), tb(NULL), i1(in1), cli(NULL) {} + def(FALSE), tb(NULL), i1(in1), cli(NULL), tbh(NULL) {} QStyleOption(int in1, int in2) : - def(FALSE), tb(NULL), i1(in1), i2(in2), cli(NULL) {} + def(FALSE), tb(NULL), i1(in1), i2(in2), cli(NULL), tbh(NULL) {} QStyleOption(int in1, int in2, int in3, int in4) : - def(FALSE), tb(NULL), i1(in1), i2(in2), i3(in3), i4(in4), cli(NULL) {} - QStyleOption(QMenuItem* m) : def(FALSE), mi(m), tb(NULL), cli(NULL) {} - QStyleOption(QMenuItem* m, int in1) : def(FALSE), mi(m), tb(NULL), i1(in1), cli(NULL) {} - QStyleOption(QMenuItem* m, int in1, int in2) : def(FALSE), mi(m), tb(NULL), i1(in1), i2(in2), cli(NULL) {} - QStyleOption(const QColor& c) : def(FALSE), tb(NULL), cl(&c), cli(NULL) {} - QStyleOption(QTab* t) : def(FALSE), tb(t), cli(NULL) {} - QStyleOption(QListViewItem* i) : def(FALSE), tb(NULL), li(i), cli(NULL) {} - QStyleOption(QCheckListItem* i) : def(FALSE), tb(NULL), cli(i) {} - QStyleOption(Qt::ArrowType a) : def(FALSE), tb(NULL), i1((int)a), cli(NULL) {} - QStyleOption(const QRect& r) : def(FALSE), tb(NULL), i1(r.x()), i2(r.y()), i3(r.width()), i4(r.height()), cli(NULL) {} - QStyleOption(QWidget *w) : def(FALSE), tb(NULL), cli(NULL), p1((void*)w) {} + def(FALSE), tb(NULL), i1(in1), i2(in2), i3(in3), i4(in4), cli(NULL), tbh(NULL) {} + QStyleOption(QMenuItem* m) : def(FALSE), mi(m), tb(NULL), cli(NULL), tbh(NULL) {} + QStyleOption(QMenuItem* m, int in1) : def(FALSE), mi(m), tb(NULL), i1(in1), cli(NULL), tbh(NULL) {} + QStyleOption(QMenuItem* m, int in1, int in2) : def(FALSE), mi(m), tb(NULL), i1(in1), i2(in2), cli(NULL), tbh(NULL) {} + QStyleOption(const QColor& c) : def(FALSE), tb(NULL), cl(&c), cli(NULL), tbh(NULL) {} + QStyleOption(QTab* t) : def(FALSE), tb(t), cli(NULL), tbh(NULL) {} + QStyleOption(QListViewItem* i) : def(FALSE), tb(NULL), li(i), cli(NULL), tbh(NULL) {} + QStyleOption(QCheckListItem* i) : def(FALSE), tb(NULL), cli(i), tbh(NULL) {} + QStyleOption(Qt::ArrowType a) : def(FALSE), tb(NULL), i1((int)a), cli(NULL), tbh(NULL) {} + QStyleOption(const QRect& r) : def(FALSE), tb(NULL), i1(r.x()), i2(r.y()), i3(r.width()), i4(r.height()), cli(NULL), tbh(NULL) {} + QStyleOption(QWidget *w) : def(FALSE), tb(NULL), cli(NULL), p1((void*)w), tbh(NULL) {} bool isDefault() const { return def; } @@ -109,6 +109,9 @@ public: QRect rect() const { return QRect( i1, i2, i3, i4 ); } QWidget* widget() const { return (QWidget*)p1; } + QStyleOption(QTab* t, QTab* h) : def(FALSE), tb(t), cli(NULL), tbh(h) {} + QTab* hoverTab() const { return tbh; } + private: // NOTE: none of these components have constructors. bool def; @@ -121,6 +124,7 @@ private: int i5, i6; // reserved QCheckListItem* cli; void *p1, *p2, *p3, *p4; // reserved + QTab* tbh; // (padded to 64 bytes on some architectures) }; @@ -129,6 +133,8 @@ class QStyleHintReturn; // not defined yet typedef QMap<Q_UINT32, QSize> DialogButtonSizeMap; typedef QMap<Q_INT32, Q_INT32> TabIdentifierIndexMap; +class QStyleControlElementGenericWidgetData; + class QStyleControlElementPopupMenuData { public: // @@ -142,13 +148,6 @@ class QStyleControlElementCheckListItemData { int height; }; -class QStyleControlElementTabBarData { - public: - int tabCount; - QTabBar::Shape shape; - TabIdentifierIndexMap identIndexMap; -}; - class QStyleControlElementListViewData { public: bool rootDecorated; @@ -200,7 +199,23 @@ class QStyleControlElementGenericWidgetData { QFont font; }; -class QStyleControlElementData { +class QStyleControlElementTabBarData { + public: + int tabCount; + int currentTabIndex; + QTabBar::Shape shape; + TabIdentifierIndexMap identIndexMap; + QStyleControlElementGenericWidgetData cornerWidgets[4]; + + enum CornerWidgetLocation { + CWL_TopLeft = 0, + CWL_TopRight = 1, + CWL_BottomLeft = 2, + CWL_BottomRight = 3 + }; +}; + +class Q_EXPORT QStyleControlElementData { public: QStringList widgetObjectTypes; bool allDataPopulated; @@ -251,6 +266,10 @@ class QStyleControlElementData { Q_UINT32 comboBoxLineEditFlags; Q_UINT32 frameStyle; QRect sliderRect; + QPainter* activePainter; + + public: + QStyleControlElementData(); }; class Q_EXPORT QStyleWidgetActionRequestData { @@ -260,6 +279,7 @@ class Q_EXPORT QStyleWidgetActionRequestData { QStyleWidgetActionRequestData(QPalette palette, bool informWidgets = FALSE, const char* className = 0); QStyleWidgetActionRequestData(QFont font, bool informWidgets = FALSE, const char* className = 0); QStyleWidgetActionRequestData(QRect rect); + QStyleWidgetActionRequestData(QPaintEvent* paintEvent); ~QStyleWidgetActionRequestData(); public: bool bool1; @@ -271,6 +291,7 @@ class Q_EXPORT QStyleWidgetActionRequestData { QRect rect; const char * cstr; QString string; + QPaintEvent * paintEvent; }; typedef QStyleWidgetActionRequestData QStyleApplicationActionRequestData; @@ -309,6 +330,7 @@ public: CEF_IsActiveWindow = 0x00200000, CEF_IsTopLevel = 0x00400000, CEF_IsVisible = 0x00800000, + CEF_HasMouse = 0x01000000 }; // New QStyle API - most of these should probably be pure virtual @@ -1094,7 +1116,10 @@ public: WAR_SetBackgroundMode, WAR_SetBackgroundOrigin, WAR_SetFont, - WAR_RepaintAllAccelerators + WAR_RepaintAllAccelerators, + WAR_SetDefault, + WAR_UnSetDefault, + WAR_SendPaintEvent }; typedef bool (*WidgetActionRequestHook)(QStyleControlElementData ceData, ControlElementFlags elementFlags, void* source, WidgetActionRequest request, QStyleWidgetActionRequestData requestData); |