diff options
author | Andy Shaw <andy.shaw@theqtcompany.com> | 2015-09-23 14:01:15 +0000 |
---|---|---|
committer | Andy Shaw <andy.shaw@theqtcompany.com> | 2015-09-24 06:00:34 +0000 |
commit | 0daddff57d17715e17b96a02eb7dab9489801e64 (patch) | |
tree | 8cb78130070f8875cc8f9a01f9f54c242ce7a904 /src | |
parent | 7894e252d192c8fa2e0f9e66ad0c69a086670b05 (diff) |
Ensure the right color is used for drawing the label text in a combobox
After QWindowsStyle was changed to use a different color from the palette
for the CE_ComboBoxLabel case it caused it to override the color used by
the plastique style. By going right to QCommonStyle we bypass the changes
done by the Windows style and thus ensure it is drawn correctly.
Change-Id: Ic1398afc16e2498f25287f55526301fb7f17731c
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/plugins/styles/plastique/qplastiquestyle.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/styles/plastique/qplastiquestyle.cpp b/src/plugins/styles/plastique/qplastiquestyle.cpp index a418ffa..f8525aa 100644 --- a/src/plugins/styles/plastique/qplastiquestyle.cpp +++ b/src/plugins/styles/plastique/qplastiquestyle.cpp @@ -3615,7 +3615,7 @@ void QPlastiqueStyle::drawControl(ControlElement element, const QStyleOption *op // we need the label to be drawn using ButtonText where it // would usually use Text. painter->setPen(QPen(comboBox->palette.buttonText(), 0)); - QProxyStyle::drawControl(element, option, painter, widget); + QCommonStyle::drawControl(element, option, painter, widget); } else if (!comboBox->currentIcon.isNull()) { { QRect editRect = proxy()->subControlRect(CC_ComboBox, comboBox, SC_ComboBoxEditField, widget); |