summaryrefslogtreecommitdiffstats
path: root/src/styles
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2012-11-03 20:34:16 -0500
committerTimothy Pearson <[email protected]>2012-11-03 20:34:16 -0500
commit380f29a7b4539f4b22e37774389f0845a742ad24 (patch)
treeb43d69e05e5147da556df01368e115193a5cd3cb /src/styles
parent180abfff4d31bc8db66fea92cf070ff21b7a5e2f (diff)
downloadqt3-380f29a7b4539f4b22e37774389f0845a742ad24.tar.gz
qt3-380f29a7b4539f4b22e37774389f0845a742ad24.zip
Extend style information structures slightly
Diffstat (limited to 'src/styles')
-rw-r--r--src/styles/qcommonstyle.cpp9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/styles/qcommonstyle.cpp b/src/styles/qcommonstyle.cpp
index 1cc2540..f033df2 100644
--- a/src/styles/qcommonstyle.cpp
+++ b/src/styles/qcommonstyle.cpp
@@ -66,6 +66,7 @@
#include "qradiobutton.h"
#include "qbitmap.h"
#include "qprogressbar.h"
+#include "qlistbox.h"
#include "private/qdialogbuttons_p.h"
#include <limits.h>
#include <qpixmap.h>
@@ -265,6 +266,7 @@ QStyleControlElementData populateControlElementDataFromWidget(const QWidget* wid
if (populateReliantFields) {
ceData.fgColor = widget->foregroundColor();
ceData.colorGroup = widget->colorGroup();
+ ceData.paletteBgColor = widget->paletteBackgroundColor();
}
ceData.geometry = widget->geometry();
ceData.rect = widget->rect();
@@ -504,6 +506,7 @@ QStyleControlElementData populateControlElementDataFromWidget(const QWidget* wid
if (populateReliantFields) {
ceData.viewportData.fgColor = viewport->foregroundColor();
ceData.viewportData.colorGroup = viewport->colorGroup();
+ ceData.viewportData.paletteBgColor = viewport->paletteBackgroundColor();
}
ceData.viewportData.geometry = viewport->geometry();
ceData.viewportData.rect = viewport->rect();
@@ -524,6 +527,10 @@ QStyleControlElementData populateControlElementDataFromWidget(const QWidget* wid
if (lineEdit) {
ceData.comboBoxLineEditFlags = getControlElementFlagsForObject(lineEdit, ceData.widgetObjectTypes, QStyleOption::Default);
}
+ const QListBox* listBox = cb->listBox();
+ if (listBox) {
+ ceData.comboBoxListBoxFlags = getControlElementFlagsForObject(listBox, ceData.widgetObjectTypes, QStyleOption::Default);
+ }
}
}
if (ceData.widgetObjectTypes.contains("QFrame")) {
@@ -554,6 +561,7 @@ QStyleControlElementData populateControlElementDataFromWidget(const QWidget* wid
if (populateReliantFields) {
ceData.parentWidgetData.fgColor = parentWidget->foregroundColor();
ceData.parentWidgetData.colorGroup = parentWidget->colorGroup();
+ ceData.parentWidgetData.paletteBgColor = parentWidget->paletteBackgroundColor();
}
ceData.parentWidgetData.geometry = parentWidget->geometry();
ceData.parentWidgetData.rect = parentWidget->rect();
@@ -580,6 +588,7 @@ QStyleControlElementData populateControlElementDataFromWidget(const QWidget* wid
if (toolbar) {
ceData.toolBarData.orientation = toolbar->orientation();
}
+ ceData.parentWidgetFlags = getControlElementFlagsForObject(parentWidget, ceData.parentWidgetData.widgetObjectTypes, QStyleOption::Default, populateReliantFields);
}
QCheckListItem *item = opt.checkListItem();