dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix clear search box

Browse Source
This commit is contained in:
Jonas Kvinge
2018-09-04 22:55:38 +02:00
parent 36ab26c49a
commit 1119c87b2f
2 changed files with 121 additions and 221 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
3rdparty/qocoa/qsearchfield.h vendored
View File

@@ -6,43 +6,38 @@
#include <QMenu> #include <QMenu>
class QSearchFieldPrivate; class QSearchFieldPrivate;
class QSearchField : public QWidget class QSearchField : public QWidget {
{ Q_OBJECT
Q_OBJECT
Q_PROPERTY(QString text READ text WRITE setText NOTIFY textChanged USER true); Q_PROPERTY(QString text READ text WRITE setText NOTIFY textChanged USER true);
Q_PROPERTY(QString placeholderText READ placeholderText WRITE setPlaceholderText); Q_PROPERTY(QString placeholderText READ placeholderText WRITE setPlaceholderText);
public: public:
explicit QSearchField(QWidget *parent); explicit QSearchField(QWidget *parent);
QString text() const; QString text() const;
QString placeholderText() const; QString placeholderText() const;
void setFocus(Qt::FocusReason); void setFocus(Qt::FocusReason);
void setMenu(QMenu *menu);
public slots: public slots:
void setText(const QString &text); void setText(const QString &text);
void setPlaceholderText(const QString &text); void setPlaceholderText(const QString &text);
void clear(); void clear();
void selectAll(); void selectAll();
void setFocus(); void setFocus();
signals: signals:
void textChanged(const QString &text); void textChanged(const QString &text);
void editingFinished(); void editingFinished();
void returnPressed(); void returnPressed();
private slots:
void popupMenu();
protected: protected:
void changeEvent(QEvent*); void resizeEvent(QResizeEvent*);
void resizeEvent(QResizeEvent*); bool eventFilter(QObject*, QEvent*);
private: private:
friend class QSearchFieldPrivate; friend class QSearchFieldPrivate;
QPointer <QSearchFieldPrivate> pimpl; QPointer <QSearchFieldPrivate> pimpl;
}; };
#endif // QSEARCHFIELD_H #endif // QSEARCHFIELD_H

297
3rdparty/qocoa/qsearchfield_nonmac.cpp vendored
View File

@@ -22,235 +22,140 @@ THE SOFTWARE.
#include "qsearchfield.h" #include "qsearchfield.h"
#include <QApplication>
#include <QDesktopWidget>
#include <QLineEdit> #include <QLineEdit>
#include <QVBoxLayout> #include <QVBoxLayout>
#include <QToolButton> #include <QToolButton>
#include <QStyle> #include <QStyle>
#include <QApplication> #include <QEvent>
#include <QDesktopWidget>
#include <QDir> #include <QDir>
#include <QDebug> #include <QDebug>
class QSearchFieldPrivate : public QObject #include "../../src/core/iconloader.h"
{
class QSearchFieldPrivate : public QObject {
public: public:
QSearchFieldPrivate(QSearchField *searchField, QLineEdit *lineEdit, QToolButton *clearButton, QToolButton *searchButton) QSearchFieldPrivate(QSearchField *searchField, QLineEdit *lineEdit, QToolButton *clearButton)
: QObject(searchField), lineEdit(lineEdit), clearButton(clearButton), searchButton(searchButton) {} : QObject(searchField), lineEdit(lineEdit), clearButton(clearButton) {}
int lineEditFrameWidth() const { int lineEditFrameWidth() const {
return lineEdit->style()->pixelMetric(QStyle::PM_DefaultFrameWidth); return lineEdit->style()->pixelMetric(QStyle::PM_DefaultFrameWidth);
} }
int clearButtonPaddedWidth() const { int clearButtonPaddedWidth() const {
return clearButton->width() + lineEditFrameWidth() * 2; return clearButton->width() + lineEditFrameWidth() * 2;
} }
int clearButtonPaddedHeight() const { int clearButtonPaddedHeight() const {
return clearButton->height() + lineEditFrameWidth() * 2; return clearButton->height() + lineEditFrameWidth() * 2;
} }
int searchButtonPaddedWidth() const { QPointer<QLineEdit> lineEdit;
return searchButton->width() + lineEditFrameWidth() * 2; QPointer<QToolButton> clearButton;
}
int searchButtonPaddedHeight() const {
return searchButton->height() + lineEditFrameWidth() * 2;
}
QPointer<QLineEdit> lineEdit;
QPointer<QToolButton> clearButton;
QPointer<QToolButton> searchButton;
QPointer<QMenu> searchMenu;
}; };
QSearchField::QSearchField(QWidget *parent) : QWidget(parent) QSearchField::QSearchField(QWidget *parent) : QWidget(parent) {
{
QLineEdit *lineEdit = new QLineEdit(this);
connect(lineEdit, SIGNAL(textChanged(QString)),
this, SIGNAL(textChanged(QString)));
connect(lineEdit, SIGNAL(editingFinished()),
this, SIGNAL(editingFinished()));
connect(lineEdit, SIGNAL(returnPressed()),
this, SIGNAL(returnPressed()));
connect(lineEdit, SIGNAL(textChanged(QString)),
this, SLOT(setText(QString)));
int iconsize = style()->pixelMetric(QStyle::PM_SmallIconSize); QLineEdit *lineEdit = new QLineEdit(this);
QToolButton *clearButton = new QToolButton(this); connect(lineEdit, SIGNAL(textChanged(QString)), this, SIGNAL(textChanged(QString)));
QIcon clearIcon = QIcon::fromTheme(QLatin1String("edit-clear"), connect(lineEdit, SIGNAL(editingFinished()), this, SIGNAL(editingFinished()));
QIcon(QLatin1String(":/Qocoa/qsearchfield_nonmac_clear.png"))); connect(lineEdit, SIGNAL(returnPressed()), this, SIGNAL(returnPressed()));
clearButton->setIcon(clearIcon); connect(lineEdit, SIGNAL(textChanged(QString)), this, SLOT(setText(QString)));
clearButton->setIconSize(QSize(iconsize, iconsize));
clearButton->setFixedSize(QSize(iconsize, iconsize));
clearButton->setStyleSheet("border: none;");
clearButton->hide();
connect(clearButton, SIGNAL(clicked()), this, SLOT(clear()));
QToolButton *searchButton = new QToolButton(this); QToolButton *clearButton = new QToolButton(this);
QIcon searchIcon = QIcon(QLatin1String(":/Qocoa/qsearchfield_nonmac_magnifier.png")); QIcon clearIcon(IconLoader::Load("edit-clear-locationbar-ltr"));
searchButton->setIcon(searchIcon);
searchButton->setIconSize(QSize(iconsize, iconsize));
searchButton->setFixedSize(QSize(iconsize, iconsize));
searchButton->setStyleSheet("border: none;");
searchButton->setPopupMode(QToolButton::InstantPopup);
searchButton->setEnabled(false);
connect(searchButton, SIGNAL(clicked()), this, SLOT(popupMenu()));
pimpl = new QSearchFieldPrivate(this, lineEdit, clearButton, searchButton); clearButton->setIcon(clearIcon);
clearButton->setIconSize(QSize(16, 16));
clearButton->setStyleSheet("border: none; padding: 0px;");
clearButton->resize(clearButton->sizeHint());
lineEdit->setStyleSheet(QString("QLineEdit { padding-left: %1px; padding-right: %2px; } ") connect(clearButton, SIGNAL(clicked()), this, SLOT(clear()));
.arg(pimpl->searchButtonPaddedWidth())
.arg(pimpl->clearButtonPaddedWidth())); pimpl = new QSearchFieldPrivate(this, lineEdit, clearButton);
const int width = qMax(lineEdit->minimumSizeHint().width(), pimpl->clearButtonPaddedWidth() + pimpl->searchButtonPaddedWidth());
const int height = qMax(lineEdit->minimumSizeHint().height(), const int frame_width = lineEdit->style()->pixelMetric(QStyle::PM_DefaultFrameWidth);
qMax(pimpl->clearButtonPaddedHeight(),
pimpl->searchButtonPaddedHeight())); lineEdit->setStyleSheet(QString("QLineEdit { padding-left: %1px; } ").arg(clearButton->width()));
lineEdit->setMinimumSize(width, height); const int width = frame_width + qMax(lineEdit->minimumSizeHint().width(), pimpl->clearButtonPaddedWidth());
const int height = frame_width + qMax(lineEdit->minimumSizeHint().height(), pimpl->clearButtonPaddedHeight());
lineEdit->setMinimumSize(width, height);
QVBoxLayout *layout = new QVBoxLayout(this);
layout->setMargin(0);
layout->addWidget(lineEdit);
lineEdit->installEventFilter(this);
QVBoxLayout *layout = new QVBoxLayout(this);
layout->setMargin(0);
layout->addWidget(lineEdit);
} }
void QSearchField::setMenu(QMenu *menu) void QSearchField::setText(const QString &text) {
{
Q_ASSERT(pimpl);
if (!pimpl)
return;
pimpl->searchMenu = menu; Q_ASSERT(pimpl && pimpl->clearButton && pimpl->lineEdit);
if (!(pimpl && pimpl->clearButton && pimpl->lineEdit)) return;
if (text != this->text()) pimpl->lineEdit->setText(text);
QIcon searchIcon = menu ? QIcon(QLatin1String(":/Qocoa/qsearchfield_nonmac_magnifier_menu.png"))
: QIcon(QLatin1String(":/Qocoa/qsearchfield_nonmac_magnifier.png"));
pimpl->searchButton->setIcon(searchIcon);
pimpl->searchButton->setEnabled(isEnabled() && menu);
} }
void QSearchField::popupMenu() void QSearchField::setPlaceholderText(const QString &text) {
{ Q_ASSERT(pimpl && pimpl->lineEdit);
Q_ASSERT(pimpl); if (!(pimpl && pimpl->lineEdit)) return;
if (!pimpl) pimpl->lineEdit->setPlaceholderText(text);
return;
if (pimpl->searchMenu) {
const QRect screenRect = qApp->desktop()->availableGeometry(pimpl->searchButton);
const QSize sizeHint = pimpl->searchMenu->sizeHint();
const QRect rect = pimpl->searchButton->rect();
const int x = pimpl->searchButton->isRightToLeft()
? rect.right() - sizeHint.width()
: rect.left();
const int y = pimpl->searchButton->mapToGlobal(QPoint(0, rect.bottom())).y() + sizeHint.height() <= screenRect.height()
? rect.bottom()
: rect.top() - sizeHint.height();
QPoint point = pimpl->searchButton->mapToGlobal(QPoint(x, y));
point.rx() = qMax(screenRect.left(), qMin(point.x(), screenRect.right() - sizeHint.width()));
point.ry() += 1;
pimpl->searchMenu->popup(point);
}
}
void QSearchField::changeEvent(QEvent* event)
{
if (event->type() == QEvent::EnabledChange) {
Q_ASSERT(pimpl);
if (!pimpl)
return;
const bool enabled = isEnabled();
pimpl->searchButton->setEnabled(enabled && pimpl->searchMenu);
pimpl->lineEdit->setEnabled(enabled);
pimpl->clearButton->setEnabled(enabled);
}
QWidget::changeEvent(event);
}
void QSearchField::setText(const QString &text)
{
Q_ASSERT(pimpl && pimpl->clearButton && pimpl->lineEdit);
if (!(pimpl && pimpl->clearButton && pimpl->lineEdit))
return;
pimpl->clearButton->setVisible(!text.isEmpty());
if (text != this->text())
pimpl->lineEdit->setText(text);
}
void QSearchField::setPlaceholderText(const QString &text)
{
Q_ASSERT(pimpl && pimpl->lineEdit);
if (!(pimpl && pimpl->lineEdit))
return;
#if QT_VERSION >= 0x040700
pimpl->lineEdit->setPlaceholderText(text);
#endif
}
void QSearchField::clear()
{
Q_ASSERT(pimpl && pimpl->lineEdit);
if (!(pimpl && pimpl->lineEdit))
return;
pimpl->lineEdit->clear();
}
void QSearchField::selectAll()
{
Q_ASSERT(pimpl && pimpl->lineEdit);
if (!(pimpl && pimpl->lineEdit))
return;
pimpl->lineEdit->selectAll();
}
QString QSearchField::text() const
{
Q_ASSERT(pimpl && pimpl->lineEdit);
if (!(pimpl && pimpl->lineEdit))
return QString();
return pimpl->lineEdit->text();
} }
QString QSearchField::placeholderText() const { QString QSearchField::placeholderText() const {
Q_ASSERT(pimpl && pimpl->lineEdit); return pimpl->lineEdit->placeholderText();
if (!(pimpl && pimpl->lineEdit))
return QString();
#if QT_VERSION >= 0x040700
return pimpl->lineEdit->placeholderText();
#else
return QString();
#endif
} }
void QSearchField::setFocus(Qt::FocusReason reason) void QSearchField::setFocus(Qt::FocusReason reason) {
{ Q_ASSERT(pimpl && pimpl->lineEdit);
Q_ASSERT(pimpl && pimpl->lineEdit); if (pimpl && pimpl->lineEdit) pimpl->lineEdit->setFocus(reason);
if (pimpl && pimpl->lineEdit)
pimpl->lineEdit->setFocus(reason);
} }
void QSearchField::setFocus() void QSearchField::setFocus() {
{ setFocus(Qt::OtherFocusReason);
setFocus(Qt::OtherFocusReason);
} }
void QSearchField::resizeEvent(QResizeEvent *resizeEvent) void QSearchField::clear() {
{ Q_ASSERT(pimpl && pimpl->lineEdit);
Q_ASSERT(pimpl && pimpl->clearButton && pimpl->lineEdit); if (!(pimpl && pimpl->lineEdit)) return;
if (!(pimpl && pimpl->clearButton && pimpl->lineEdit)) pimpl->lineEdit->clear();
return; }
QWidget::resizeEvent(resizeEvent); void QSearchField::selectAll() {
const int x = width() - pimpl->clearButtonPaddedWidth(); Q_ASSERT(pimpl && pimpl->lineEdit);
const int y = (height() - pimpl->clearButton->height())/2; if (!(pimpl && pimpl->lineEdit)) return;
pimpl->clearButton->move(x, y); pimpl->lineEdit->selectAll();
}
pimpl->searchButton->move(pimpl->lineEditFrameWidth() * 2,
(height() - pimpl->searchButton->height())/2); QString QSearchField::text() const {
Q_ASSERT(pimpl && pimpl->lineEdit);
if (!(pimpl && pimpl->lineEdit)) return QString();
return pimpl->lineEdit->text();
}
void QSearchField::resizeEvent(QResizeEvent *resizeEvent) {
Q_ASSERT(pimpl && pimpl->clearButton && pimpl->lineEdit);
if (!(pimpl && pimpl->clearButton && pimpl->lineEdit)) return;
QWidget::resizeEvent(resizeEvent);
const int x = pimpl->lineEditFrameWidth();
const int y = (height() - pimpl->clearButton->height())/2;
pimpl->clearButton->move(x, y);
}
bool QSearchField::eventFilter(QObject *o, QEvent *e) {
if (pimpl && pimpl->lineEdit && o == pimpl->lineEdit) {
// Forward some lineEdit events to QSearchField (only those we need for
// now, but some might be added later if needed)
switch (e->type()) {
case QEvent::FocusIn:
case QEvent::FocusOut:
QApplication::sendEvent(this, e);
break;
}
}
return QWidget::eventFilter(o, e);
} }