From 4037eb7e84eda2b72a456cf7ff19182c2d4a1f7a Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 17 Oct 2012 15:03:40 -0500 Subject: Add tab corner widget information to style data structures This breaks the style ABI --- src/kernel/qstyle.h | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) (limited to 'src/kernel') diff --git a/src/kernel/qstyle.h b/src/kernel/qstyle.h index 324b987..1d20b8c 100644 --- a/src/kernel/qstyle.h +++ b/src/kernel/qstyle.h @@ -133,6 +133,8 @@ class QStyleHintReturn; // not defined yet typedef QMap DialogButtonSizeMap; typedef QMap TabIdentifierIndexMap; +class QStyleControlElementGenericWidgetData; + class QStyleControlElementPopupMenuData { public: // @@ -146,13 +148,6 @@ class QStyleControlElementCheckListItemData { int height; }; -class QStyleControlElementTabBarData { - public: - int tabCount; - QTabBar::Shape shape; - TabIdentifierIndexMap identIndexMap; -}; - class QStyleControlElementListViewData { public: bool rootDecorated; @@ -204,6 +199,22 @@ class QStyleControlElementGenericWidgetData { QFont font; }; +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; -- cgit v1.2.1