Funkwhale
/
Clementine-audio-player-Mac-Linux-Windows
mirror of https://github.com/clementine-player/Clementine
1
0
Fork 0
Code Issues Releases Wiki Activity

Don't hide the popup when pressing enter, and show it again when re-focusing the search box

This commit is contained in:
David Sansome 2011-09-17 14:22:19 +01:00
parent 02257d8b37
commit d9533fca26
2 changed files with 32 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/globalsearch/globalsearchwidget.cpp
View File

@ -69,6 +69,8 @@ GlobalSearchWidget::GlobalSearchWidget(QWidget* parent)
view_->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
view_->setEditTriggers(QAbstractItemView::NoEditTriggers);
ui_->search->installEventFilter(this);
connect(ui_->search, SIGNAL(textEdited(QString)), SLOT(TextEdited(QString)));
connect(engine_, SIGNAL(ResultsAvailable(int,SearchProvider::ResultList)),
SLOT(AddResults(int,SearchProvider::ResultList)));
@ -210,15 +212,37 @@ void GlobalSearchWidget::RepositionPopup() {
}
bool GlobalSearchWidget::eventFilter(QObject* o, QEvent* e) {
// Most of this is borrowed from QCompleter::eventFilter
if (o == ui_->search)
return EventFilterSearchWidget(o, e);
if (eat_focus_out_ && o == ui_->search && e->type() == QEvent::FocusOut) {
if (view_->isVisible())
if (o == view_)
return EventFilterPopup(o, e);
return QWidget::eventFilter(o, e);
}
bool GlobalSearchWidget::EventFilterSearchWidget(QObject* o, QEvent* e) {
switch (e->type()) {
case QEvent::FocusOut:
if (eat_focus_out_ && view_->isVisible())
return true;
break;
case QEvent::FocusIn:
case QEvent::MouseButtonPress:
if (!ui_->search->text().isEmpty())
RepositionPopup();
break;
default:
break;
}
if (o != view_)
return QWidget::eventFilter(o, e);
return QWidget::eventFilter(o, e);
}
bool GlobalSearchWidget::EventFilterPopup(QObject*, QEvent* e) {
// Most of this is borrowed from QCompleter::eventFilter
switch (e->type()) {
case QEvent::KeyPress: {
@ -355,7 +379,6 @@ void GlobalSearchWidget::AddCurrent() {
return;
engine_->LoadTracksAsync(index.data(Role_Result).value<SearchProvider::Result>());
static_cast<LineEditInterface*>(ui_->search)->clear();
}
void GlobalSearchWidget::TracksLoaded(int id, MimeData* mime_data) {

3
src/globalsearch/globalsearchwidget.h
View File

@ -79,6 +79,9 @@ private:
void Reset();
void RepositionPopup();
bool EventFilterSearchWidget(QObject* o, QEvent* e);
bool EventFilterPopup(QObject* o, QEvent* e);
private:
Ui_GlobalSearchWidget* ui_;