diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/kernel/ntqstyle.h | 10 | ||||
| -rw-r--r-- | src/styles/qcommonstyle.cpp | 9 |
2 files changed, 19 insertions, 0 deletions
diff --git a/src/kernel/ntqstyle.h b/src/kernel/ntqstyle.h index 90f4eacff..de5977fe0 100644 --- a/src/kernel/ntqstyle.h +++ b/src/kernel/ntqstyle.h @@ -202,6 +202,7 @@ class TQStyleControlElementGenericWidgetData { TQPixmap icon; TQPalette palette; TQFont font; + TQColor paletteBgColor; }; class TQStyleControlElementTabBarData { @@ -276,6 +277,9 @@ class Q_EXPORT TQStyleControlElementData { TQRect sliderRect; TQPainter* activePainter; TQStyleControlElementToolBarWidgetData toolBarData; + TQ_UINT32 comboBoxListBoxFlags; + TQColor paletteBgColor; + TQ_UINT32 parentWidgetFlags; public: TQStyleControlElementData(); @@ -1050,6 +1054,12 @@ public: // int - width of menu check column SH_MenuIndicatorColumnWidth, + // bool - whether or not the lower two button drawing areas should be combined into one + SH_ScrollBar_CombineAddLineRegionDrawingAreas, + + // bool - whether or not the upper two button drawing areas should be combined into one + SH_ScrollBar_CombineSubLineRegionDrawingAreas, + // do not add any values below/greater than this SH_CustomBase = 0xf0000000 }; diff --git a/src/styles/qcommonstyle.cpp b/src/styles/qcommonstyle.cpp index 402354c62..19b5aa444 100644 --- a/src/styles/qcommonstyle.cpp +++ b/src/styles/qcommonstyle.cpp @@ -66,6 +66,7 @@ #include "ntqradiobutton.h" #include "ntqbitmap.h" #include "ntqprogressbar.h" +#include "ntqlistbox.h" #include "private/qdialogbuttons_p.h" #include <limits.h> #include <ntqpixmap.h> @@ -265,6 +266,7 @@ TQStyleControlElementData populateControlElementDataFromWidget(const TQWidget* w 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 @@ TQStyleControlElementData populateControlElementDataFromWidget(const TQWidget* w 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 @@ TQStyleControlElementData populateControlElementDataFromWidget(const TQWidget* w if (lineEdit) { ceData.comboBoxLineEditFlags = getControlElementFlagsForObject(lineEdit, ceData.widgetObjectTypes, TQStyleOption::Default); } + const TQListBox* listBox = cb->listBox(); + if (listBox) { + ceData.comboBoxListBoxFlags = getControlElementFlagsForObject(listBox, ceData.widgetObjectTypes, TQStyleOption::Default); + } } } if (ceData.widgetObjectTypes.contains("TQFrame")) { @@ -554,6 +561,7 @@ TQStyleControlElementData populateControlElementDataFromWidget(const TQWidget* w 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 @@ TQStyleControlElementData populateControlElementDataFromWidget(const TQWidget* w if (toolbar) { ceData.toolBarData.orientation = toolbar->orientation(); } + ceData.parentWidgetFlags = getControlElementFlagsForObject(parentWidget, ceData.parentWidgetData.widgetObjectTypes, TQStyleOption::Default, populateReliantFields); } TQCheckListItem *item = opt.checkListItem(); |