summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-10-31 23:30:20 -0500
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-10-31 23:30:20 -0500
commit294ec2ee1fca27847ba0e913a3b11f7382e0492e (patch)
treeb209f37b902d45067a40b18c8fb6a0989a318069
parent289363b959ac4720ee604f1dfba54c624f0098c0 (diff)
downloadqt3-294ec2ee1fca27847ba0e913a3b11f7382e0492e.tar.gz
qt3-294ec2ee1fca27847ba0e913a3b11f7382e0492e.zip
Add parent toolbar information to style info structs
-rw-r--r--src/kernel/qstyle.h6
-rw-r--r--src/styles/qcommonstyle.cpp4
2 files changed, 10 insertions, 0 deletions
diff --git a/src/kernel/qstyle.h b/src/kernel/qstyle.h
index 341473e..111a987 100644
--- a/src/kernel/qstyle.h
+++ b/src/kernel/qstyle.h
@@ -178,6 +178,11 @@ class QStyleControlElementDockWidgetData {
Qt::Orientation areaOrientation;
};
+class QStyleControlElementToolBarWidgetData {
+ public:
+ Qt::Orientation orientation;
+};
+
class QStyleControlElementGenericWidgetData {
public:
QStringList widgetObjectTypes;
@@ -270,6 +275,7 @@ class Q_EXPORT QStyleControlElementData {
Q_UINT32 frameStyle;
QRect sliderRect;
QPainter* activePainter;
+ QStyleControlElementToolBarWidgetData toolBarData;
public:
QStyleControlElementData();
diff --git a/src/styles/qcommonstyle.cpp b/src/styles/qcommonstyle.cpp
index 3a1a8d8..1cc2540 100644
--- a/src/styles/qcommonstyle.cpp
+++ b/src/styles/qcommonstyle.cpp
@@ -576,6 +576,10 @@ QStyleControlElementData populateControlElementDataFromWidget(const QWidget* wid
}
ceData.dwData.closeEnabled = dw->isCloseEnabled();
}
+ const QToolBar * toolbar = dynamic_cast<const QToolBar*>(parentWidget);
+ if (toolbar) {
+ ceData.toolBarData.orientation = toolbar->orientation();
+ }
}
QCheckListItem *item = opt.checkListItem();