Fix #20: update SelectionModel behavior to support a separated currentItem for each scope

Author: CrSjimo

src/libs/3rdparty/scopicflow

@@ -167,22 +167,22 @@ namespace dspx {
         if (targetSelectionType != d->selectionType) {
             switch (d->selectionType) {
                 case ST_AnchorNode:
-                    // d->anchorNodeSelectionModel->d_func()->clearAll();
+                    // d->anchorNodeSelectionModel->d_func()->select(nullptr, command);
                     break;
                 case ST_Clip:
-                    d->clipSelectionModel->d_func()->clearAll();
+                    d->clipSelectionModel->d_func()->select(nullptr, command);
                     break;
                 case ST_Label:
-                    d->labelSelectionModel->d_func()->clearAll();
+                    d->labelSelectionModel->d_func()->select(nullptr, command);
                     break;
                 case ST_Note:
-                    d->noteSelectionModel->d_func()->clearAll();
+                    d->noteSelectionModel->d_func()->select(nullptr, command);
                     break;
                 case ST_Tempo:
-                    d->tempoSelectionModel->d_func()->clearAll();
+                    d->tempoSelectionModel->d_func()->select(nullptr, command);
                     break;
                 case ST_Track:
-                    d->trackSelectionModel->d_func()->clearAll();
+                    d->trackSelectionModel->d_func()->select(nullptr, command);
                     break;
                 default:
                     break;

src/libs/application/dspxmodel/src/selectionmodel/SelectionModel.cpp

@@ -31,6 +31,7 @@ namespace VisualEditor {
         selectionModel = q->windowHandle()->projectDocumentContext()->document()->selectionModel();
         labelSelectionModel = q->windowHandle()->projectDocumentContext()->document()->selectionModel()->labelSelectionModel();
         connect(labelSelectionModel, &dspx::LabelSelectionModel::currentItemChanged, this, &SelectionController::currentItemChanged);
+        connect(selectionModel, &dspx::SelectionModel::selectionTypeChanged, this, &SelectionController::editScopeFocusedChanged);
     }
 
     LabelSelectionController::~LabelSelectionController() = default;
@@ -88,4 +89,8 @@ namespace VisualEditor {
         return q->getLabelViewItemFromDocumentItem(labelSelectionModel->currentItem());
     }
 
+    bool LabelSelectionController::editScopeFocused() const {
+        return selectionModel->selectionType() == dspx::SelectionModel::ST_Label;
+    }
+
 }

src/plugins/visualeditor/core/selectioncontrollers/LabelSelectionController.cpp

@@ -26,6 +26,7 @@ namespace VisualEditor {
         QObjectList getItemsBetween(QObject *startItem, QObject *endItem) const override;
         void select(QObject *item, SelectionCommand command) override;
         QObject *currentItem() const override;
+        bool editScopeFocused() const override;
 
     private:
         ProjectViewModelContext *q;

src/plugins/visualeditor/core/selectioncontrollers/LabelSelectionController_p.h

@@ -31,6 +31,7 @@ namespace VisualEditor {
         selectionModel = q->windowHandle()->projectDocumentContext()->document()->selectionModel();
         tempoSelectionModel = q->windowHandle()->projectDocumentContext()->document()->selectionModel()->tempoSelectionModel();
         connect(tempoSelectionModel, &dspx::TempoSelectionModel::currentItemChanged, this, &SelectionController::currentItemChanged);
+        connect(selectionModel, &dspx::SelectionModel::selectionTypeChanged, this, &SelectionController::editScopeFocusedChanged);
     }
 
     TempoSelectionController::~TempoSelectionController() = default;
@@ -88,4 +89,8 @@ namespace VisualEditor {
         return q->getTempoViewItemFromDocumentItem(tempoSelectionModel->currentItem());
     }
 
+    bool TempoSelectionController::editScopeFocused() const {
+        return selectionModel->selectionType() == dspx::SelectionModel::ST_Tempo;
+    }
+
 }

src/plugins/visualeditor/core/selectioncontrollers/TempoSelectionController.cpp

@@ -26,6 +26,7 @@ namespace VisualEditor {
         QObjectList getItemsBetween(QObject *startItem, QObject *endItem) const override;
         void select(QObject *item, SelectionCommand command) override;
         QObject *currentItem() const override;
+        bool editScopeFocused() const override;
 
     private:
         ProjectViewModelContext *q;

src/plugins/visualeditor/core/selectioncontrollers/TempoSelectionController_p.h

@@ -30,6 +30,7 @@ namespace VisualEditor {
         selectionModel = q->windowHandle()->projectDocumentContext()->document()->selectionModel();
         trackSelectionModel = selectionModel->trackSelectionModel();
         connect(trackSelectionModel, &dspx::TrackSelectionModel::currentItemChanged, this, &SelectionController::currentItemChanged);
+        connect(selectionModel, &dspx::SelectionModel::selectionTypeChanged, this, &SelectionController::editScopeFocusedChanged);
     }
 
     TrackSelectionController::~TrackSelectionController() = default;
@@ -90,4 +91,8 @@ namespace VisualEditor {
         return q->getTrackViewItemFromDocumentItem(trackSelectionModel->currentItem());
     }
 
+    bool TrackSelectionController::editScopeFocused() const {
+        return selectionModel->selectionType() == dspx::SelectionModel::ST_Track;
+    }
+
 }

src/plugins/visualeditor/core/selectioncontrollers/TrackSelectionController.cpp

@@ -24,6 +24,7 @@ namespace VisualEditor {
         QObjectList getItemsBetween(QObject *startItem, QObject *endItem) const override;
         void select(QObject *item, SelectionCommand command) override;
         QObject *currentItem() const override;
+        bool editScopeFocused() const override;
 
     private:
         ProjectViewModelContext *q;