diff --git a/src/libs/utils/fancylineedit.cpp b/src/libs/utils/fancylineedit.cpp index 90afa176d360c1b2b171f49746a241e27b0dff3a..75b79772eedf000d0c122f7bdf785e8389efa0b2 100644 --- a/src/libs/utils/fancylineedit.cpp +++ b/src/libs/utils/fancylineedit.cpp @@ -111,7 +111,7 @@ FancyLineEdit::FancyLineEdit(QWidget *parent) : QIcon icon = QIcon::fromTheme(layoutDirection() == Qt::LeftToRight ? QLatin1String("edit-clear-locationbar-rtl") : QLatin1String("edit-clear-locationbar-ltr"), - QIcon::fromTheme("edit-clear", QIcon(QLatin1String("clear.png")))); + QIcon::fromTheme("edit-clear", QIcon(QLatin1String(":/core/images/editclear.png")))); m_d->m_iconbutton->installEventFilter(m_d); m_d->m_iconbutton->setIcon(icon); @@ -186,10 +186,10 @@ void FancyLineEdit::resizeEvent(QResizeEvent *) iconpos = (iconpos == Left ? Right : Left); if (iconpos == FancyLineEdit::Right) { - const int iconoffset = textMargins().right() + 8; + const int iconoffset = textMargins().right() + 4; m_d->m_iconbutton->setGeometry(contentRect.adjusted(width() - iconoffset, 0, 0, 0)); } else { - const int iconoffset = textMargins().left() + 8; + const int iconoffset = textMargins().left() + 4; m_d->m_iconbutton->setGeometry(contentRect.adjusted(0, 0, -width() + iconoffset, 0)); } } @@ -274,7 +274,7 @@ void IconButton::paintEvent(QPaintEvent *) QPixmap iconpixmap = icon().pixmap(QSize(ICONBUTTON_SIZE, ICONBUTTON_SIZE), state, QIcon::Off); QRect pixmapRect = QRect(0, 0, iconpixmap.width(), iconpixmap.height()); - pixmapRect.moveCenter(rect().center()); + pixmapRect.moveCenter(rect().translated(0,-1).center()); if (static_cast<FancyLineEdit*>(parentWidget())->autoHideIcon()) painter.setOpacity(m_iconOpacity); diff --git a/src/plugins/coreplugin/core.qrc b/src/plugins/coreplugin/core.qrc index 31b8174e7d6471bd4b1fb04610a71df0cd51a8d9..84d8955c2f03feaad48eef507d91b5d474cb252c 100644 --- a/src/plugins/coreplugin/core.qrc +++ b/src/plugins/coreplugin/core.qrc @@ -53,5 +53,6 @@ <file>editormanager/BinFiles.mimetypes.xml</file> <file>images/progressbar.png</file> <file>images/help.png</file> + <file>images/editclear.png</file> </qresource> </RCC> diff --git a/src/plugins/coreplugin/images/editclear.png b/src/plugins/coreplugin/images/editclear.png new file mode 100644 index 0000000000000000000000000000000000000000..7954c7d3c72315e10d4f2c8c121f805f19999439 Binary files /dev/null and b/src/plugins/coreplugin/images/editclear.png differ