Update arrangement functionalities

Author: CrSjimo

src/libs/3rdparty/scopicflow

@@ -137,12 +137,10 @@ namespace Core::Internal {
                     if (i == spec.visibleIndex || opened) {
                         visibleIndices.append(result.size());
                     }
-                    if (data.isValid()) {
-                        object->setProperty("panelPersistentData", data);
-                    }
                     result.append(QVariantMap{
                         {"object", QVariant::fromValue(object)},
                         {"geometry", geometry},
+                        {"state", data}
                     });
                 }
             }

src/plugins/coreplugin/internal/addon/WorkspaceAddOn.cpp

@@ -104,8 +104,16 @@ QtObject {
             }
             return v.object
         }
+        const loadState = v => {
+            try {
+                v.object.loadState(v.state)
+                console.debug(lcWorkspaceAddOnHelper, "State loaded:", v.object, v.object.ActionInstantiator.id)
+            } catch (e) {
+            }
+        }
         const f = (dockingView, edge) => {
             let o = addOn.createDockingViewContents(edge)
+            o.objects.forEach(loadState)
             dockingView.contentData = o.objects.map(conv)
             dockingView.preferredPanelSize = o.preferredPanelSize
             dockingView.splitterRatio = o.splitterRatio
@@ -118,8 +126,10 @@ QtObject {
 
         let topData = addOn.createDockingViewContents(Qt.TopEdge)
         let bottomData = addOn.createDockingViewContents(Qt.BottomEdge)
+        topData.objects.forEach(loadState)
         window.topDockingView.contentData = topData.objects.map(conv)
         window.topDockingView.splitterRatio = topData.splitterRatio
+        bottomData.objects.forEach(loadState)
         window.bottomDockingView.contentData = bottomData.objects.map(conv)
         window.bottomDockingView.splitterRatio = bottomData.splitterRatio
         window.topDockingViewHeightRatio = topData.preferredPanelSize
@@ -140,6 +150,15 @@ QtObject {
         console.info(lcWorkspaceAddOnHelper, "Saving current layout")
         savingCurrentLayout = true
         let viewSpecMap = []
+        const saveState = o => {
+            try {
+                let state = o.saveState()
+                console.debug(lcWorkspaceAddOnHelper, "State saved:", o, o.ActionInstantiator.id)
+                return state
+            } catch (e) {
+                return undefined
+            }
+        }
         const f = (dockingView, isLeftOrRight, firstKey, lastKey) => {
             console.debug(lcWorkspaceAddOnHelper, "Saving docking view", firstKey);
             viewSpecMap[firstKey] = {
@@ -150,7 +169,7 @@ QtObject {
                         dock: o.dock,
                         opened: o.Docking.window?.visible ?? false,
                         geometry: Qt.rect(o.Docking.window?.x ?? 0, o.Docking.window?.y ?? 0, o.Docking.window?.width ?? 0, o.Docking.window?.height ?? 0),
-                        data: o.panelPersistentData
+                        data: saveState(o)
                     }
                     console.debug(lcWorkspaceAddOnHelper, "Handled panel spec",o , v.id, v.dock, v.opened, v.geometry, v.data)
                     return v
@@ -169,7 +188,7 @@ QtObject {
                         dock: o.dock,
                         opened: o.Docking.window?.visible ?? false,
                         geometry: Qt.rect(o.Docking.window?.x ?? 0, o.Docking.window?.y ?? 0, o.Docking.window?.width ?? 0, o.Docking.window?.height ?? 0),
-                        data: o.panelPersistentData
+                        data: saveState(o)
                     }
                     console.debug(lcWorkspaceAddOnHelper, "Handled panel spec",o , v.id, v.dock, v.opened, v.geometry, v.data)
                     return v

src/plugins/coreplugin/qml/windows/WorkspaceAddOnHelper.qml

@@ -16,6 +16,7 @@
 #include <coreplugin/ProjectWindowInterface.h>
 #include <coreplugin/ProjectTimeline.h>
 
+#include <visualeditor/AutoPageScrollingManipulator.h>
 #include <visualeditor/PositionAlignmentManipulator.h>
 #include <visualeditor/ProjectViewModelContext.h>
 #include <visualeditor/internal/EditorPreference.h>
@@ -88,6 +89,22 @@ namespace VisualEditor {
         });
     }
 
+    void ArrangementPanelInterfacePrivate::bindPositionAlignmentManipulator() const {
+        Q_Q(const ArrangementPanelInterface);
+        positionAlignmentManipulator->setAutoDurationPositionAlignment(Internal::EditorPreference::autoDurationPositionAlignment());
+        QObject::connect(Internal::EditorPreference::instance(), &Internal::EditorPreference::autoDurationPositionAlignmentChanged, positionAlignmentManipulator, [=, this] {
+            positionAlignmentManipulator->setAutoDurationPositionAlignment(Internal::EditorPreference::autoDurationPositionAlignment());
+        });
+        QObject::connect(q, &ArrangementPanelInterface::snapTemporarilyDisabledChanged, positionAlignmentManipulator, [=, this] {
+            if (isSnapTemporarilyDisabled) {
+                previousDuration = positionAlignmentManipulator->duration();
+                positionAlignmentManipulator->setDuration(PositionAlignmentManipulator::Unset);
+            } else {
+                positionAlignmentManipulator->setDuration(previousDuration);
+            }
+        });
+    }
+
     ArrangementPanelInterface::ArrangementPanelInterface(Core::ProjectWindowInterface *windowHandle) : QObject(windowHandle), d_ptr(new ArrangementPanelInterfacePrivate) {
         Q_D(ArrangementPanelInterface);
         Q_ASSERT(windowHandle->getObjects(staticMetaObject.className()).isEmpty());
@@ -102,6 +119,11 @@ namespace VisualEditor {
 
         d->positionAlignmentManipulator = new PositionAlignmentManipulator(this);
         d->positionAlignmentManipulator->setTimeLayoutViewModel(d->timeLayoutViewModel);
+        d->autoPageScrollingManipulator = new AutoPageScrollingManipulator(this);
+        d->autoPageScrollingManipulator->setEnabled(true);
+        d->autoPageScrollingManipulator->setTimeViewModel(d->timeViewModel);
+        d->autoPageScrollingManipulator->setTimeLayoutViewModel(d->timeLayoutViewModel);
+        d->autoPageScrollingManipulator->setPlaybackViewModel(ProjectViewModelContext::of(d->windowHandle)->playbackViewModel());
 
         QQmlComponent component(Core::RuntimeInterface::qmlEngine(), "DiffScope.VisualEditor", "ArrangementView");
         if (component.isError()) {
@@ -118,10 +140,13 @@ namespace VisualEditor {
         d->arrangementView = qobject_cast<QQuickItem *>(o);
         Q_ASSERT(d->arrangementView);
 
+        d->autoPageScrollingManipulator->setTarget(d->arrangementView->property("timeline").value<QQuickItem *>());
+
         d->bindTimeViewModel();
         d->bindTimeLayoutViewModel();
         d->bindTimelineInteractionController();
         d->bindScrollBehaviorViewModel();
+        d->bindPositionAlignmentManipulator();
     }
 
     ArrangementPanelInterface::~ArrangementPanelInterface() = default;
@@ -157,6 +182,11 @@ namespace VisualEditor {
         return d->positionAlignmentManipulator;
     }
 
+    AutoPageScrollingManipulator *ArrangementPanelInterface::autoPageScrollingManipulator() const {
+        Q_D(const ArrangementPanelInterface);
+        return d->autoPageScrollingManipulator;
+    }
+
     QQuickItem *ArrangementPanelInterface::arrangementView() const {
         Q_D(const ArrangementPanelInterface);
         return d->arrangementView;
@@ -175,6 +205,19 @@ namespace VisualEditor {
         }
     }
 
+    bool ArrangementPanelInterface::isSnapTemporarilyDisabled() const {
+        Q_D(const ArrangementPanelInterface);
+        return d->isSnapTemporarilyDisabled;
+    }
+
+    void ArrangementPanelInterface::setSnapTemporarilyDisabled(bool disabled) {
+        Q_D(ArrangementPanelInterface);
+        if (d->isSnapTemporarilyDisabled != disabled) {
+            d->isSnapTemporarilyDisabled = disabled;
+            Q_EMIT snapTemporarilyDisabledChanged();
+        }
+    }
+
 }
 
-#include "moc_ArrangementPanelInterface.cpp"
+#include "moc_ArrangementPanelInterface.cpp"

src/plugins/visualeditor/core/ArrangementPanelInterface.cpp

@@ -26,6 +26,7 @@ namespace VisualEditor {
     }
 
     class PositionAlignmentManipulator;
+    class AutoPageScrollingManipulator;
 
     class ArrangementPanelInterfacePrivate;
 
@@ -40,8 +41,10 @@ namespace VisualEditor {
         Q_PROPERTY(sflow::ScrollBehaviorViewModel *scrollBehaviorViewModel READ scrollBehaviorViewModel CONSTANT)
         Q_PROPERTY(sflow::TimelineInteractionController *timelineInteractionController READ timelineInteractionController CONSTANT)
         Q_PROPERTY(PositionAlignmentManipulator *positionAlignmentManipulator READ positionAlignmentManipulator CONSTANT)
+        Q_PROPERTY(AutoPageScrollingManipulator *autoPageScrollingManipulator READ autoPageScrollingManipulator CONSTANT)
         Q_PROPERTY(QQuickItem *arrangementView READ arrangementView CONSTANT)
         Q_PROPERTY(Tool tool READ tool WRITE setTool NOTIFY toolChanged)
+        Q_PROPERTY(bool snapTemporarilyDisabled READ isSnapTemporarilyDisabled WRITE setSnapTemporarilyDisabled NOTIFY snapTemporarilyDisabledChanged)
 
     public:
         ~ArrangementPanelInterface() override;
@@ -56,6 +59,7 @@ namespace VisualEditor {
         sflow::TimelineInteractionController *timelineInteractionController() const;
 
         PositionAlignmentManipulator *positionAlignmentManipulator() const;
+        AutoPageScrollingManipulator *autoPageScrollingManipulator() const;
 
         QQuickItem *arrangementView() const;
 
@@ -68,8 +72,12 @@ namespace VisualEditor {
         Tool tool() const;
         void setTool(Tool tool);
 
+        bool isSnapTemporarilyDisabled() const;
+        void setSnapTemporarilyDisabled(bool disabled);
+
     Q_SIGNALS:
         void toolChanged();
+        void snapTemporarilyDisabledChanged();
 
     private:
         friend class Internal::ArrangementAddOn;

src/plugins/visualeditor/core/ArrangementPanelInterface.h

@@ -2,6 +2,7 @@
 #define DIFFSCOPE_VISUALEDITOR_ARRANGEMENTPANELINTERFACE_P_H
 
 #include <visualeditor/ArrangementPanelInterface.h>
+#include <visualeditor/PositionAlignmentManipulator.h>
 
 namespace VisualEditor {
 
@@ -17,15 +18,20 @@ namespace VisualEditor {
         sflow::ScrollBehaviorViewModel *scrollBehaviorViewModel;
 
         PositionAlignmentManipulator *positionAlignmentManipulator;
+        AutoPageScrollingManipulator *autoPageScrollingManipulator;
 
         QQuickItem *arrangementView;
 
         ArrangementPanelInterface::Tool tool{ArrangementPanelInterface::PointerTool};
+        bool isSnapTemporarilyDisabled{false};
+
+        mutable PositionAlignmentManipulator::Duration previousDuration{};
 
         void bindTimeViewModel() const;
         void bindTimeLayoutViewModel() const;
         void bindTimelineInteractionController() const;
         void bindScrollBehaviorViewModel() const;
+        void bindPositionAlignmentManipulator() const;
     };
 
 }