Support clear markers

friction2d · Jun 29, 2024 · 3f787b4 · 3f787b4
1 parent ed5e41b
commit 3f787b4
Showing 3 changed files with 14 additions and 0 deletions.
diff --git a/src/core/canvas.cpp b/src/core/canvas.cpp
@@ -487,6 +487,12 @@ const std::vector<QPair<QString, int> > Canvas::getMarkers()
     return mMarkers;
 }
 
+void Canvas::clearMarkers()
+{
+    mMarkers.clear();
+    emit newFrameRange(mRange);
+}
+
 stdsptr<BoxRenderData> Canvas::createRenderData() {
     return enve::make_shared<CanvasRenderData>(this);
 }

diff --git a/src/core/canvas.h b/src/core/canvas.h
@@ -365,6 +365,7 @@ class CORE_EXPORT Canvas : public CanvasBase
     bool hasMarker(const int frame,
                    const bool removeExists = false);
     const std::vector<QPair<QString,int>> getMarkers();
+    void clearMarkers();
 
     ColorAnimator *getBgColorAnimator()
     {

diff --git a/src/ui/widgets/framescrollbar.cpp b/src/ui/widgets/framescrollbar.cpp
@@ -285,12 +285,15 @@ void FrameScrollBar::mousePressEvent(QMouseEvent *event)
         const auto setFrameOutAct = new QAction(tr("Set Frame Out"), this);
         const auto clearFrameOutAct = new QAction(tr("Clear Frame In/Out"), this);
         const auto setMarkerAct = new QAction(tr(hasMarker ? "Remove Marker" : "Add Marker"), this);
+        const auto clearMarkersAct = new QAction(tr("Clear Markers"), this);
 
         menu.addSeparator();
         menu.addAction(setFrameInAct);
         menu.addAction(setFrameOutAct);
         menu.addAction(clearFrameOutAct);
+        menu.addSeparator();
         menu.addAction(setMarkerAct);
+        menu.addAction(clearMarkersAct);
 
         QAction* selectedAction = menu.exec(event->globalPos());
         if (selectedAction) {
@@ -337,6 +340,10 @@ void FrameScrollBar::mousePressEvent(QMouseEvent *event)
                 if (mCurrentCanvas) {
                     mCurrentCanvas->setMarker(tr("Marker"), mCurrentCanvas->getCurrentFrame());
                 }
+            } else if (selectedAction == clearMarkersAct) {
+                if (mCurrentCanvas) {
+                    mCurrentCanvas->clearMarkers();
+                }
             }
         }
         return;