Context menu for scrub head shows checkmarks, and is available during scrub

src/tracks/ui/Scrubbing.cpp

@@ -763,9 +763,20 @@ void Scrubber::PopulateMenu(wxMenu &menu)
 {
    int id = CMD_ID;
    auto cm = mProject->GetCommandManager();
+   const MenuItem *checkedItem =
+      HasStartedScrubbing()
+         ? &FindMenuItem(mSmoothScrollingScrub, mAlwaysSeeking)
+         : nullptr;
    for (const auto &item : menuItems) {
-      if (cm->GetEnabled(item.name))
+      if (cm->GetEnabled(item.name)) {
+#ifdef CHECKABLE_SCRUB_MENU_ITEMS
+         menu.AppendCheckItem(id, item.label);
+         if(&item == checkedItem)
+            menu.FindItem(id)->Check();
+#else
          menu.Append(id, item.label);
+#endif
+      }
       ++id;
    }
 }

src/widgets/Ruler.cpp

@@ -2157,6 +2157,21 @@ void AdornedRulerPanel::OnMouseEvents(wxMouseEvent &evt)
       return;
    }
 
+   // Handle popup menus
+   if (evt.RightDown() && !(evt.LeftIsDown())) {
+      if(inScrubZone)
+         ShowScrubMenu(evt.GetPosition());
+      else
+         ShowMenu(evt.GetPosition());
+
+      // dismiss and clear Quick-Play indicator
+      HideQuickPlayIndicator();
+
+      if (HasCapture())
+         ReleaseMouse();
+      return;
+   }
+
    if (scrubber.HasStartedScrubbing()) {
       // If already clicked for scrub, preempt the usual event handling,
       // no matter what the y coordinate.
@@ -2217,20 +2232,7 @@ void AdornedRulerPanel::OnMouseEvents(wxMouseEvent &evt)
       return;
    }
 
-   if (evt.RightDown() && !(evt.LeftIsDown())) {
-      if(inScrubZone)
-         ShowScrubMenu(evt.GetPosition());
-      else
-         ShowMenu(evt.GetPosition());
-
-      // dismiss and clear Quick-Play indicator
-      HideQuickPlayIndicator();
-
-      if (HasCapture())
-         ReleaseMouse();
-      return;
-   }
-   else if (inScrubZone) {
+   if (inScrubZone) {
       if (evt.LeftDown())
          scrubber.MarkScrubStart(evt.m_x, false, false);
       UpdateStatusBar(StatusChoice::EnteringScrubZone);