Commit 121e1270 authored by Eike Ziller's avatar Eike Ziller
Browse files

Hide the icon in the editor combobox (but not in its popup)



Otherwise we have the lock icon from the tool button and from the combo
box next to each other.

Change-Id: I74d0ba42cd38ea37f2f8aa7e8d08a733174f1dce
Reviewed-by: default avatarTobias Hunger <tobias.hunger@nokia.com>
parent cb8ec57c
......@@ -135,6 +135,7 @@ EditorToolBar::EditorToolBar(QWidget *parent) :
connect(d->m_goBackAction, SIGNAL(triggered()), this, SIGNAL(goBackClicked()));
connect(d->m_goForwardAction, SIGNAL(triggered()), this, SIGNAL(goForwardClicked()));
d->m_editorList->setProperty("hideicon", true);
d->m_editorList->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
d->m_editorList->setMinimumContentsLength(20);
d->m_editorList->setModel(d->m_editorsListModel);
......
......@@ -698,8 +698,9 @@ void ManhattanStyle::drawControl(ControlElement element, const QStyleOption *opt
painter->save();
QRect editRect = subControlRect(CC_ComboBox, cb, SC_ComboBoxEditField, widget);
QPalette customPal = cb->palette;
bool drawIcon = !(widget && widget->property("hideicon").toBool());
if (!cb->currentIcon.isNull()) {
if (!cb->currentIcon.isNull() && drawIcon) {
QIcon::Mode mode = cb->state & State_Enabled ? QIcon::Normal
: QIcon::Disabled;
QPixmap pixmap = cb->currentIcon.pixmap(cb->iconSize, mode);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment