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

Prevent filtering when filter toolbar is hidden, clear when disabled

Browse Source
This commit is contained in:
Uint
2021-11-07 10:24:01 -08:00
committed by Jonas Kvinge
parent 5715f4c2cb
commit 7b8265d4a3
1 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/playlist/playlistcontainer.cpp
View File

@@ -264,6 +264,8 @@ void PlaylistContainer::ReloadSettings() {
bool show_toolbar = settings_.value("show_toolbar", true).toBool(); bool show_toolbar = settings_.value("show_toolbar", true).toBool();
ui_->toolbar->setVisible(show_toolbar); ui_->toolbar->setVisible(show_toolbar);
if (!show_toolbar) ui_->filter->clear();
} }
bool PlaylistContainer::SearchFieldHasFocus() const { bool PlaylistContainer::SearchFieldHasFocus() const {
@@ -271,9 +273,7 @@ bool PlaylistContainer::SearchFieldHasFocus() const {
} }
void PlaylistContainer::FocusSearchField() { void PlaylistContainer::FocusSearchField() {
if (ui_->toolbar->isVisible()) { if (ui_->toolbar->isVisible()) ui_->filter->setFocus();
ui_->filter->setFocus();
}
} }
void PlaylistContainer::ActivePlaying() { void PlaylistContainer::ActivePlaying() {
@@ -455,19 +455,18 @@ void PlaylistContainer::resizeEvent(QResizeEvent *e) {
void PlaylistContainer::FocusOnFilter(QKeyEvent *event) { void PlaylistContainer::FocusOnFilter(QKeyEvent *event) {
ui_->filter->setFocus(); if (ui_->toolbar->isVisible()) {
ui_->filter->setFocus();
switch (event->key()) { switch (event->key()) {
case Qt::Key_Backspace: case Qt::Key_Backspace:
break; break;
case Qt::Key_Escape:
case Qt::Key_Escape: ui_->filter->clear();
ui_->filter->clear(); break;
break; default:
ui_->filter->setText(ui_->filter->text() + event->text());
default: break;
ui_->filter->setText(ui_->filter->text() + event->text()); }
break;
} }
} }