Update key signature and scale highlighting

Author: CrSjimo

src/libs/3rdparty/scopicflow

@@ -67,8 +67,8 @@ namespace Core::Internal {
             {"levelMeterColor", QVariant::fromValue(QColor(0x111112))},
             {"editAreaPrimaryColor", QVariant::fromValue(QColor(0x333740))},
             {"editAreaSecondaryColor", QVariant::fromValue(QColor(0x444954))},
-            {"editAreaPrimaryHighlightColor", QVariant::fromValue(QColor(0x5566ff))},
-            {"editAreaSecondaryHighlightColor", QVariant::fromValue(QColor(0x7d8aff))}, // TODO
+            {"editAreaPrimaryHighlightColor", QVariant::fromValue(QColor(0x3c4370))},
+            {"editAreaSecondaryHighlightColor", QVariant::fromValue(QColor(0x48507f))}, // TODO
             {"playheadPrimaryColor", QVariant::fromValue(QColor(0xcc4455))},
             {"playheadSecondaryColor", QVariant::fromValue(QColor::fromRgba(0x7fcc4455))},
             {"cursorIndicatorColor", QVariant::fromValue(QColor::fromRgba(0xbf00bfff))},

src/plugins/coreplugin/internal/colorscheme/ColorSchemeCollection.cpp

@@ -529,6 +529,19 @@ namespace VisualEditor {
         }
     }
 
+    bool PianoRollPanelInterface::isScaleHighlightEnabled() const {
+        Q_D(const PianoRollPanelInterface);
+        return d->scaleHighlightEnabled;
+    }
+
+    void PianoRollPanelInterface::setScaleHighlightEnabled(bool enabled) {
+        Q_D(PianoRollPanelInterface);
+        if (d->scaleHighlightEnabled != enabled) {
+            d->scaleHighlightEnabled = enabled;
+            Q_EMIT scaleHighlightEnabledChanged();
+        }
+    }
+
     dspx::SingingClip *PianoRollPanelInterface::editingClip() const {
         Q_D(const PianoRollPanelInterface);
         auto items = d->editingClipSelectionModel->clipSelectionModel()->selectedItems();

src/plugins/visualeditor/core/PianoRollPanelInterface.cpp

@@ -64,6 +64,7 @@ namespace VisualEditor {
         Q_PROPERTY(Tool tool READ tool WRITE setTool NOTIFY toolChanged)
         Q_PROPERTY(bool snapTemporarilyDisabled READ isSnapTemporarilyDisabled WRITE setSnapTemporarilyDisabled NOTIFY snapTemporarilyDisabledChanged)
         Q_PROPERTY(bool mouseTrackingDisabled READ isMouseTrackingDisabled WRITE setMouseTrackingDisabled NOTIFY mouseTrackingDisabledChanged)
+        Q_PROPERTY(bool scaleHighlightEnabled READ isScaleHighlightEnabled WRITE setScaleHighlightEnabled NOTIFY scaleHighlightEnabledChanged)
         Q_PROPERTY(dspx::SingingClip *editingClip READ editingClip WRITE setEditingClip NOTIFY editingClipChanged)
         Q_PROPERTY(int implicitNoteLength READ implicitNoteLength WRITE setImplicitNoteLength NOTIFY implicitNoteLengthChanged)
     public:
@@ -108,6 +109,9 @@ namespace VisualEditor {
         bool isMouseTrackingDisabled() const;
         void setMouseTrackingDisabled(bool disabled);
 
+        bool isScaleHighlightEnabled() const;
+        void setScaleHighlightEnabled(bool enabled);
+
         dspx::SingingClip *editingClip() const;
         void setEditingClip(dspx::SingingClip *clip);
 
@@ -118,6 +122,7 @@ namespace VisualEditor {
         void toolChanged();
         void snapTemporarilyDisabledChanged();
         void mouseTrackingDisabledChanged();
+        void scaleHighlightEnabledChanged();
         void editingClipChanged();
         void implicitNoteLengthChanged();
 

src/plugins/visualeditor/core/PianoRollPanelInterface.h

@@ -48,6 +48,7 @@ namespace VisualEditor {
         PianoRollPanelInterface::Tool tool{PianoRollPanelInterface::PointerTool};
         bool isSnapTemporarilyDisabled{false};
         bool isMouseTrackingDisabled{false};
+        bool scaleHighlightEnabled{false};
 
         dspx::SelectionModel *editingClipSelectionModel;
         int implicitNoteLength{480};

src/plugins/visualeditor/core/PianoRollPanelInterface_p.h

@@ -207,6 +207,7 @@ namespace VisualEditor {
 
             qCDebug(lcKeySignatureViewModelContextData) << "KeySignature view item pos updated" << viewItem << viewItem->position();
             transactionalUpdatedKeySignatures.insert(viewItem);
+            item->setPos(viewItem->position());
         });
 
         keySignatureSequenceViewModel->insertItem(viewItem);
@@ -292,7 +293,7 @@ namespace VisualEditor {
         for (auto viewItem : transactionalUpdatedKeySignatures) {
             auto item = keySignatureDocumentItemMap.value(viewItem);
             Q_ASSERT(item);
-            item->setPos(viewItem->position());
+            // Position is already synchronized immediately, no need to set it here
             updatedItems.insert(item);
         }
         transactionalUpdatedKeySignatures.clear();

src/plugins/visualeditor/core/viewmodelbinding/KeySignatureViewModelContextData.cpp

@@ -416,7 +416,7 @@ Item {
                         timeViewModel: view.pianoRollPanelInterface?.timeViewModel ?? null
                         timeLayoutViewModel: view.pianoRollPanelInterface?.timeLayoutViewModel ?? null
                         clavierViewModel: view.pianoRollPanelInterface?.clavierViewModel ?? null
-                        scaleHighlightSequenceViewModel: view.projectViewModelContext?.scaleHighlightSequenceViewModel ?? null
+                        scaleHighlightSequenceViewModel: view.pianoRollPanelInterface?.scaleHighlightEnabled ? (view.projectViewModelContext?.scaleHighlightSequenceViewModel ?? null) : null
                     }
                     Item {
                         id: noteEditLayerSequenceStack

src/plugins/visualeditor/qml/PianoRollView.qml

@@ -210,6 +210,15 @@ ActionCollection {
         }
     }
 
+    ActionItem {
+        actionId: "org.diffscope.visualeditor.pianoRollPanel.highlightScale"
+        Action {
+            checkable: true
+            checked: d.pianoRollPanelInterface?.scaleHighlightEnabled ?? false
+            onTriggered: d.pianoRollPanelInterface.scaleHighlightEnabled = checked
+        }
+    }
+
     ActionItem {
         actionId: "org.diffscope.visualeditor.pianoRollPanel.autoPageScrolling"
         Action {

src/plugins/visualeditor/qml/actions/PianoRollAddOnActions.qml

@@ -60,6 +60,7 @@
         <action id="org.diffscope.visualeditor.pianoRollPanel.snapTuplet" diffscope:componentType="menu" />
         <action id="org.diffscope.visualeditor.pianoRollPanel.autoPageScrolling" icon="playhead_panel_chevron_double" />
         <action id="org.diffscope.visualeditor.pianoRollPanel.editingClip" diffscope:componentType="widget" />
+        <action id="org.diffscope.visualeditor.pianoRollPanel.highlightScale" />
         <action id="org.diffscope.visualeditor.pianoRollPanel.showTrackSelector" icon="navigation" />
 
         <action id="org.diffscope.visualeditor.panel.arrangement" catalog="org.diffscope.core.workspacePanelWidgets" icon="gantt_chart" diffscope:uniquePanel="true" diffscope:componentType="custom"/>
@@ -142,6 +143,7 @@
             <group id="org.diffscope.visualeditor.pianoRollPanelToolBar.editingClipActions">
                 <action id="org.diffscope.visualeditor.pianoRollPanel.editingClip" />
             </group>
+            <action id="org.diffscope.visualeditor.pianoRollPanel.highlightScale" />
             <stretch />
             <action id="org.diffscope.visualeditor.pianoRollPanel.autoPageScrolling" />
         </menu>