Update Group in Preview Widget when focused

* Fixes #3129
* Also fix out of bounds access when no entries are present in EntryView and up/down arrow pressed
This commit is contained in:
Jonathan White 2019-05-31 07:23:18 -04:00
parent 91283e7c76
commit 96b0ea45dd
4 changed files with 21 additions and 10 deletions

View File

@ -787,6 +787,9 @@ void DatabaseWidget::switchToMainView(bool previousDialogAccepted)
}
m_newParent = nullptr;
} else {
// Workaround: ensure entries are focused so search doesn't reset
m_entryView->setFocus();
}
setCurrentWidget(m_mainWidget);

View File

@ -139,7 +139,7 @@ void EntryView::keyPressEvent(QKeyEvent* event)
}
int last = m_model->rowCount() - 1;
if (last > 0) {
if (event->key() == Qt::Key_Up && currentIndex().row() == 0) {
QModelIndex index = m_sortModel->mapToSource(m_sortModel->index(last, 0));
setCurrentEntry(m_model->entryFromIndex(index));
@ -151,6 +151,7 @@ void EntryView::keyPressEvent(QKeyEvent* event)
setCurrentEntry(m_model->entryFromIndex(index));
return;
}
}
QTreeView::keyPressEvent(event);
}

View File

@ -72,6 +72,12 @@ void GroupView::dragMoveEvent(QDragMoveEvent* event)
}
}
void GroupView::focusInEvent(QFocusEvent* event)
{
emitGroupChanged();
QTreeView::focusInEvent(event);
}
Group* GroupView::currentGroup()
{
if (currentIndex() == QModelIndex()) {

View File

@ -47,6 +47,7 @@ private slots:
protected:
void dragMoveEvent(QDragMoveEvent* event) override;
void focusInEvent(QFocusEvent* event) override;
private:
void recInitExpanded(Group* group);