diff options
| author | Darrell Anderson <humanreadable@yahoo.com> | 2012-12-19 14:03:09 -0600 |
|---|---|---|
| committer | Darrell Anderson <humanreadable@yahoo.com> | 2012-12-19 14:03:09 -0600 |
| commit | 35202ed0d899a9ff3c77dad72b501fb30e4dcf93 (patch) | |
| tree | 683787f69d937483b860973ce17f0c5d430a142d /src/styles/qcommonstyle.cpp | |
| parent | 8d5add0e87ad913bdf0362a83f431995115f3bfa (diff) | |
| parent | f19aa203c934d0f85862fdf810a87fe7c5777d17 (diff) | |
| download | qt3-35202ed0d899a9ff3c77dad72b501fb30e4dcf93.tar.gz qt3-35202ed0d899a9ff3c77dad72b501fb30e4dcf93.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/qt3
Diffstat (limited to 'src/styles/qcommonstyle.cpp')
| -rw-r--r-- | src/styles/qcommonstyle.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/styles/qcommonstyle.cpp b/src/styles/qcommonstyle.cpp index a44ee9f..0ab98b4 100644 --- a/src/styles/qcommonstyle.cpp +++ b/src/styles/qcommonstyle.cpp @@ -347,6 +347,11 @@ QStyleControlElementData populateControlElementDataFromWidget(const QWidget* wid const QButton *button = dynamic_cast<const QButton*>(widget); if (button) { ceData.text = button->text(); + const QPixmap* paletteBgPixmap = 0; + paletteBgPixmap = button->paletteBackgroundPixmap(); + if (paletteBgPixmap) { + ceData.paletteBgPixmap = *paletteBgPixmap; + } } } if (ceData.widgetObjectTypes.contains("QTabBar")) { @@ -3215,6 +3220,13 @@ int QCommonStyle::styleHint(StyleHint sh, const QStyleControlElementData &ceData ret = 0; break; + case SH_PopupMenu_SubMenuArrowColorActiveEnabled: + case SH_PopupMenu_SubMenuArrowColorActiveDisabled: + case SH_PopupMenu_SubMenuArrowColorInactiveEnabled: + case SH_PopupMenu_SubMenuArrowColorInactiveDisabled: + ret = -1; + break; + default: ret = 0; break; |