diff options
| author | Darrell Anderson <humanreadable@yahoo.com> | 2012-12-19 14:03:14 -0600 |
|---|---|---|
| committer | Darrell Anderson <humanreadable@yahoo.com> | 2012-12-19 14:03:14 -0600 |
| commit | f8224f3a623495e4e1dbf852554d7601a6b7c4c4 (patch) | |
| tree | d5583114ba48669960c9f7d68927687ea652a0b8 /src/styles | |
| parent | 25240579092616b09d28705ac84e13e49b744707 (diff) | |
| parent | e8cbbedf46da493d2c206444a7e18e5777402905 (diff) | |
| download | tqt3-f8224f3a623495e4e1dbf852554d7601a6b7c4c4.tar.gz tqt3-f8224f3a623495e4e1dbf852554d7601a6b7c4c4.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tqt3
Diffstat (limited to 'src/styles')
| -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 41ed19d0b..ad8669827 100644 --- a/src/styles/qcommonstyle.cpp +++ b/src/styles/qcommonstyle.cpp @@ -347,6 +347,11 @@ TQStyleControlElementData populateControlElementDataFromWidget(const TQWidget* w const TQButton *button = dynamic_cast<const TQButton*>(widget); if (button) { ceData.text = button->text(); + const TQPixmap* paletteBgPixmap = 0; + paletteBgPixmap = button->paletteBackgroundPixmap(); + if (paletteBgPixmap) { + ceData.paletteBgPixmap = *paletteBgPixmap; + } } } if (ceData.widgetObjectTypes.contains("TQTabBar")) { @@ -3215,6 +3220,13 @@ int TQCommonStyle::styleHint(StyleHint sh, const TQStyleControlElementData &ceDa 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; |