Searchbox rounded corners

.. gone in flat mode.
This commit is contained in:
Mark Liversedge
2014-06-09 20:39:59 +01:00
parent 74484fc70a
commit 3cfbf6aa49
4 changed files with 62 additions and 23 deletions

View File

@@ -68,13 +68,51 @@ SearchBox::SearchBox(Context *context, QWidget *parent, bool nochooser)
searchButton->setCursor(Qt::ArrowCursor);
connect(searchButton, SIGNAL(clicked()), this, SLOT(toggleMode()));
int frameWidth = style()->pixelMetric(QStyle::PM_DefaultFrameWidth);
#ifdef Q_OS_MAC
setAttribute(Qt::WA_MacShowFocusRect, 0);
#endif
setObjectName("SearchBox");
setPlaceholderText(tr("Search..."));
mode = Search;
setDragEnabled(true);
checkMenu();
connect(this, SIGNAL(returnPressed()), this, SLOT(searchSubmit()));
connect(context, SIGNAL(configChanged()), this, SLOT(configChanged()));
// set colors and curviness
configChanged();
}
void
SearchBox::configChanged()
{
int frameWidth = style()->pixelMetric(QStyle::PM_DefaultFrameWidth);
QColor color = QPalette().color(QPalette::Highlight);
setStyleSheet(QString( //"QLineEdit { padding-right: %1px; } "
// flat mode has square corners
if (GCColor::isFlat()) {
setStyleSheet(QString( //"QLineEdit { padding-right: %1px; } "
"QLineEdit#SearchBox {"
" border-radius: 3px; "
" border: 1px solid rgba(127,127,127,127);"
" padding: 0px %1px;"
"}"
"QLineEdit#SearchBox:focus {"
" border-radius: 3px; "
#ifdef WIN32
" border: 1px solid rgba(%2,%3,%4,255);"
#else
" border: 2px solid rgba(%2,%3,%4,255);"
#endif
" padding: 0px %5px;"
"}"
).arg(clearButton->sizeHint().width() + frameWidth + 12)
.arg(color.red()).arg(color.green()).arg(color.blue())
.arg(clearButton->sizeHint().width() + frameWidth + 12));
} else {
setStyleSheet(QString( //"QLineEdit { padding-right: %1px; } "
"QLineEdit#SearchBox {"
" border-radius: 10px; "
" border: 1px solid rgba(127,127,127,127);"
@@ -93,13 +131,7 @@ SearchBox::SearchBox(Context *context, QWidget *parent, bool nochooser)
.arg(color.red()).arg(color.green()).arg(color.blue())
.arg(clearButton->sizeHint().width() + frameWidth + 12));
setPlaceholderText(tr("Search..."));
mode = Search;
setDragEnabled(true);
checkMenu();
connect(this, SIGNAL(returnPressed()), this, SLOT(searchSubmit()));
}
}
void SearchBox::resizeEvent(QResizeEvent *)