diff --git a/src/widgets/Ruler.cpp b/src/widgets/Ruler.cpp index 7461c738d..4baaa354d 100644 --- a/src/widgets/Ruler.cpp +++ b/src/widgets/Ruler.cpp @@ -1774,9 +1774,6 @@ BEGIN_EVENT_TABLE(AdornedRulerPanel, wxPanel) EVT_MENU(OnAutoScrollID, AdornedRulerPanel::OnAutoScroll) EVT_MENU(OnLockPlayRegionID, AdornedRulerPanel::OnLockPlayRegion) - // Main menu commands - EVT_MENU(OnShowHideScrubbingID, AdornedRulerPanel::OnShowHideScrubbing) - END_EVENT_TABLE() AdornedRulerPanel::AdornedRulerPanel(AudacityProject* parent, @@ -2156,15 +2153,6 @@ void AdornedRulerPanel::OnMouseEvents(wxMouseEvent &evt) : StatusChoice::NoChange ); - if (overButtons && evt.Button(wxMOUSE_BTN_ANY)) { - if(evt.ButtonDown()) - DoMainMenu(); - - if (HasCapture()) - ReleaseMouse(); - return; - } - // Handle popup menus if (evt.RightDown() && !(evt.LeftIsDown())) { if(inScrubZone) @@ -2239,46 +2227,61 @@ void AdornedRulerPanel::OnMouseEvents(wxMouseEvent &evt) return; } - if (inScrubZone) { - if (evt.LeftDown()) + if (HasCapture() && mCaptureState != Button::NoButton) + HandlePushbuttonEvent(evt); + else if (!HasCapture() && overButtons) { + if (evt.LeftDown()) { + auto position = evt.GetPosition(); + for (unsigned ii = 0; ii < static_cast(Button::NumButtons); ++ii) { + auto button = static_cast