diff options
| author | Miikka Heikkinen <miikka.heikkinen@qt.io> | 2017-11-23 12:01:04 +0200 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@qt.io> | 2017-11-23 12:08:49 +0000 |
| commit | c1229b9eb8168b62568c65e8a998037dd2735f97 (patch) | |
| tree | 8b96f207831c73f9e6c0bd6a385f1781046f8d6b | |
| parent | ee168c1574c951f4f4cbd88e077ccee05e1f1241 (diff) | |
Fix slide selection after slide removal
Change-Id: I86dbefc8630e8d35d5bcc52f90c80b9fb3d4b3aa
Reviewed-by: Marianne Yrjänä <marianne.yrjana@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
| -rw-r--r-- | src/Authoring/Studio/Palettes/Slide/SlideModel.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/Authoring/Studio/Palettes/Slide/SlideModel.cpp b/src/Authoring/Studio/Palettes/Slide/SlideModel.cpp index f31ae51f..f0db7b26 100644 --- a/src/Authoring/Studio/Palettes/Slide/SlideModel.cpp +++ b/src/Authoring/Studio/Palettes/Slide/SlideModel.cpp @@ -139,7 +139,7 @@ bool SlideModel::removeRows(int row, int count, const QModelIndex &parent) bool selectionRemoved = false; beginRemoveRows(parent, row, row + count - 1); for (int i = 0; i < count; ++i) { - if (m_selectedRow == row) + if (m_selectedRow == row + i) selectionRemoved = true; m_slides.removeAt(row); } @@ -150,9 +150,9 @@ bool SlideModel::removeRows(int row, int count, const QModelIndex &parent) if (row > 0) newSelectedRow = row - 1; else - newSelectedRow = row + count - 1; - } else if (m_selectedRow >= m_slides.count()) { - newSelectedRow = m_slides.count() - 1; + newSelectedRow = 0; + } else if (m_selectedRow > row) { + newSelectedRow = m_selectedRow - count; } if (newSelectedRow != -1) setData(index(newSelectedRow), true, SelectedRole); |