feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Fix etched combo box text in panels

Browse Source 
Some styles use etched text and drawtextitem does
not pass the widget pointer, hence our panelwidget
tests are broken. I simply replaced this with
drawText for now.
This commit is contained in:
Jens Bache-Wiig
2010-03-12 13:16:18 +01:00
parent 962c12bbd6
commit 1ffa2ffcd0
1 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/plugins/coreplugin/manhattanstyle.cpp
View File

@@ -669,20 +669,16 @@ void ManhattanStyle::drawControl(ControlElement element, const QStyleOption *opt
editRect.adjust(0, 0, -13, 0); editRect.adjust(0, 0, -13, 0);
} }
customPal.setBrush(QPalette::All, QPalette::ButtonText, QColor(0, 0, 0, 70));
QString text = option->fontMetrics.elidedText(cb->currentText, Qt::ElideRight, editRect.width()); QString text = option->fontMetrics.elidedText(cb->currentText, Qt::ElideRight, editRect.width());
if ((option->state & State_Enabled)) if ((option->state & State_Enabled)) {
drawItemText(painter, editRect.translated(0, 1), painter->setPen(QColor(0, 0, 0, 70));
visualAlignment(option->direction, Qt::AlignLeft | Qt::AlignVCenter), painter->drawText(editRect.adjusted(1, 0, -1, 0), Qt::AlignLeft | Qt::AlignVCenter, cb->currentText);
customPal, cb->state & State_Enabled, text, QPalette::ButtonText); } else {
else
painter->setOpacity(0.8); painter->setOpacity(0.8);
}
painter->setPen(Utils::StyleHelper::panelTextColor());
painter->drawText(editRect.adjusted(1, 0, -1, 0), Qt::AlignLeft | Qt::AlignVCenter, cb->currentText);
customPal.setBrush(QPalette::All, QPalette::ButtonText, Utils::StyleHelper::panelTextColor());
drawItemText(painter, editRect,
visualAlignment(option->direction, Qt::AlignLeft | Qt::AlignVCenter),
customPal, cb->state & State_Enabled, text, QPalette::ButtonText);
painter->restore(); painter->restore();
} else { } else {
QProxyStyle::drawControl(element, option, painter, widget); QProxyStyle::drawControl(element, option, painter, widget);