1
0
mirror of https://github.com/cookiengineer/audacity synced 2025-07-05 15:09:08 +02:00

Ruler tooltips no longer appear outside of the ruler

This commit is contained in:
Paul Licameli 2016-05-02 05:22:55 -04:00
parent cac54a3b57
commit 60e3791a22

View File

@ -2173,11 +2173,13 @@ void AdornedRulerPanel::OnMouseEvents(wxMouseEvent &evt)
mShowScrubbing && mShowScrubbing &&
mScrubZone.Contains(evt.GetPosition()); mScrubZone.Contains(evt.GetPosition());
const StatusChoice zone = const StatusChoice zone =
overButtons evt.Leaving()
? button ? StatusChoice::Leaving
: inScrubZone : overButtons
? StatusChoice::EnteringScrubZone ? button
: StatusChoice::EnteringQP; : inScrubZone
? StatusChoice::EnteringScrubZone
: StatusChoice::EnteringQP;
const bool changeInZone = (zone != mPrevZone); const bool changeInZone = (zone != mPrevZone);
mPrevZone = zone; mPrevZone = zone;
@ -2194,11 +2196,9 @@ void AdornedRulerPanel::OnMouseEvents(wxMouseEvent &evt)
// Handle status bar messages // Handle status bar messages
UpdateStatusBarAndTooltips ( UpdateStatusBarAndTooltips (
evt.Leaving() evt.Leaving() || evt.Entering() || changeInZone
? StatusChoice::Leaving ? zone
: evt.Entering() || changeInZone : StatusChoice::NoChange
? zone
: StatusChoice::NoChange
); );
auto &scrubber = mProject->GetScrubber(); auto &scrubber = mProject->GetScrubber();