iiiypuk/cantata
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Esc closes search if button has focus as well

Browse Source
This commit is contained in:
craig.p.drummond
2013-07-01 19:56:26 +00:00
committed by craig.p.drummond
parent a35346af7f
commit 554a8aa2be
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
widgets/searchwidget.cpp
View File

@@ -58,7 +58,7 @@ SearchWidget::SearchWidget(QWidget *p)
edit=new LineEdit(this);
edit->setPlaceholderText(i18n("Search..."));
l->addWidget(edit);
ToolButton *closeButton=new ToolButton(this);
closeButton=new ToolButton(this);
closeButton->setToolTip(i18n("Close Search Bar"));
l->addWidget(closeButton);
Icon icon=Icon("dialog-close");
@@ -70,7 +70,7 @@ SearchWidget::SearchWidget(QWidget *p)
connect(closeButton, SIGNAL(clicked()), this, SLOT(close()));
connect(edit, SIGNAL(textChanged(QString)), SIGNAL(textChanged(QString)));
connect(edit, SIGNAL(returnPressed()), SIGNAL(returnPressed()));
edit->installEventFilter(new EscKeyEventHandler(this));
installEventFilter(new EscKeyEventHandler(this));
}
void SearchWidget::toggle()

4
widgets/searchwidget.h
View File

@@ -25,6 +25,7 @@
#define SEARRCHWIDGET_H
#include "lineedit.h"
#include "toolbutton.h"
#include <QSet>
class SearchWidget : public QWidget
@@ -37,7 +38,7 @@ public:
void setText(const QString &t) { edit->setText(t); }
QString text() const { return edit->text(); }
void setFocus() { edit->setFocus(); }
bool hasFocus() const { return edit->hasFocus(); }
bool hasFocus() const { return edit->hasFocus() || closeButton->hasFocus(); }
Q_SIGNALS:
void textChanged(const QString &);
@@ -51,6 +52,7 @@ public Q_SLOTS:
private:
LineEdit *edit;
ToolButton *closeButton;
};
#endif