diff options
Diffstat (limited to 'desktop-widgets')
| -rw-r--r-- | desktop-widgets/locationinformation.cpp | 6 | ||||
| -rw-r--r-- | desktop-widgets/tab-widgets/maintab.cpp | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/desktop-widgets/locationinformation.cpp b/desktop-widgets/locationinformation.cpp index 03ebbc9b4..1c8c79aef 100644 --- a/desktop-widgets/locationinformation.cpp +++ b/desktop-widgets/locationinformation.cpp @@ -432,9 +432,8 @@ bool DiveLocationLineEdit::eventFilter(QObject *, QEvent *e) void DiveLocationLineEdit::focusOutEvent(QFocusEvent *ev) { - if (!view->isVisible()) { + if (!view->isVisible()) QLineEdit::focusOutEvent(ev); - } } void DiveLocationLineEdit::itemActivated(const QModelIndex &index) @@ -601,7 +600,8 @@ DiveLocationLineEdit::DiveSiteType DiveLocationLineEdit::currDiveSiteType() cons struct dive_site *DiveLocationLineEdit::currDiveSite() const { - return currDs; + // If there is no text, this corresponds to the empty dive site + return text().trimmed().isEmpty() ? nullptr : currDs; } DiveLocationListView::DiveLocationListView(QWidget*) diff --git a/desktop-widgets/tab-widgets/maintab.cpp b/desktop-widgets/tab-widgets/maintab.cpp index 7e8279a0b..927864fb5 100644 --- a/desktop-widgets/tab-widgets/maintab.cpp +++ b/desktop-widgets/tab-widgets/maintab.cpp @@ -86,6 +86,7 @@ MainTab::MainTab(QWidget *parent) : QTabWidget(parent), connect(ui.editDiveSiteButton, &QToolButton::clicked, MainWindow::instance(), &MainWindow::startDiveSiteEdit); connect(ui.location, &DiveLocationLineEdit::entered, MapWidget::instance(), &MapWidget::centerOnIndex); connect(ui.location, &DiveLocationLineEdit::currentChanged, MapWidget::instance(), &MapWidget::centerOnIndex); + connect(ui.location, &DiveLocationLineEdit::editingFinished, this, &MainTab::on_location_diveSiteSelected); QAction *action = new QAction(tr("Apply changes"), this); connect(action, SIGNAL(triggered(bool)), this, SLOT(acceptChanges())); |