From a403f7df4f178c17f3bf97764942eafe6e304402 Mon Sep 17 00:00:00 2001 From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de> Date: Thu, 22 Feb 2024 21:59:39 +0100 Subject: [PATCH] rm SamplesQListView::restoreSelection --- GUI/View/List/SamplesQListView.cpp | 13 ------------- GUI/View/List/SamplesQListView.h | 2 -- GUI/View/Views/SampleView.cpp | 6 ------ GUI/View/Views/SampleView.h | 2 -- 4 files changed, 23 deletions(-) diff --git a/GUI/View/List/SamplesQListView.cpp b/GUI/View/List/SamplesQListView.cpp index e873a0ad027..10a4686f7f2 100644 --- a/GUI/View/List/SamplesQListView.cpp +++ b/GUI/View/List/SamplesQListView.cpp @@ -147,19 +147,6 @@ void SamplesQListView::onCurrentChanged(const QModelIndex& index) emit currentSampleChanged(m_model->itemForIndex(index)); } -void SamplesQListView::restoreSelection() -{ - int selected = gDoc->samples()->currentIndex(); - if (selected < 0 || selected >= m_model->rowCount()) - selected = m_model->rowCount() - 1; - - QModelIndex currentIndex = m_model->index(selected, 0, QModelIndex()); - if (currentIndex.isValid()) { - selectionModel()->select(currentIndex, QItemSelectionModel::ClearAndSelect); - gDoc->samplesModifier()->setCurrentIndex(selected); - } -} - void SamplesQListView::removeSample(SampleItem* item) { m_model->removeSample(item); diff --git a/GUI/View/List/SamplesQListView.h b/GUI/View/List/SamplesQListView.h index fe95a2e33a9..921c5e1595d 100644 --- a/GUI/View/List/SamplesQListView.h +++ b/GUI/View/List/SamplesQListView.h @@ -28,8 +28,6 @@ public: SampleItem* currentSampleItem(); - void restoreSelection(); - QAction* newSampleAction() { return m_new_sample_action; } QAction* importSampleAction() { return m_import_sample_action; } QAction* chooseFromLibraryAction() { return m_choose_from_library_action; } diff --git a/GUI/View/Views/SampleView.cpp b/GUI/View/Views/SampleView.cpp index eae840f2586..a5de949a066 100644 --- a/GUI/View/Views/SampleView.cpp +++ b/GUI/View/Views/SampleView.cpp @@ -191,9 +191,3 @@ void SampleView::onAboutToRemoveItem(Item3D* item) widget->resetScene(); } } - -void SampleView::showEvent(QShowEvent*) -{ - if (!m_listing->currentSampleItem()) - m_listing->restoreSelection(); -} diff --git a/GUI/View/Views/SampleView.h b/GUI/View/Views/SampleView.h index 966472146db..448feabda0f 100644 --- a/GUI/View/Views/SampleView.h +++ b/GUI/View/Views/SampleView.h @@ -29,8 +29,6 @@ public: ~SampleView(); private: - void showEvent(QShowEvent*) override; - //! Show the item in the real space view //! //! If the real space view is not visible at the moment, it will be shown. -- GitLab