Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-06-15 15:49:36 +02:00
Code Issues Releases Wiki Activity

Bug 2416 - Mac: Grabbers of other toolbars get "pushed" when dragging another toolbar over them

Browse Source
This commit is contained in:
Leland Lucius 2021-02-11 22:27:28 -06:00
parent cd359768a6
commit 77f3cc5506
1 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/widgets/Grabber.cpp
View File

@ -215,6 +215,16 @@ void Grabber::OnLeftDown(wxMouseEvent & event)
// //
void Grabber::OnEnter(wxMouseEvent & WXUNUSED(event)) void Grabber::OnEnter(wxMouseEvent & WXUNUSED(event))
{ {
#if defined(__WXMAC__)
// Bug 2416: On Mac, we can get Enter events from grabbers other
// than the one being dragged. So, ignore Enter events if another
// window has captured the mouse.
if (wxWindow::GetCapture() != nullptr)
{
return;
}
#endif
// Bug 1201: On Mac, unsetting and re-setting the tooltip may be needed // Bug 1201: On Mac, unsetting and re-setting the tooltip may be needed
// to make it pop up when we want it. // to make it pop up when we want it.
const auto text = GetToolTipText(); const auto text = GetToolTipText();
@ -234,6 +244,16 @@ void Grabber::OnEnter(wxMouseEvent & WXUNUSED(event))
// //
void Grabber::OnLeave(wxMouseEvent & WXUNUSED(event)) void Grabber::OnLeave(wxMouseEvent & WXUNUSED(event))
{ {
#if defined(__WXMAC__)
// Bug 2416: On Mac, we can get Leave events from grabbers other
// than the one being dragged. So, ignore Leave events if another
// window has captured the mouse.
if (wxWindow::GetCapture() != nullptr)
{
return;
}
#endif
if (!GetCapture()) { if (!GetCapture()) {
// Redraw plain // Redraw plain
mOver = false; mOver = false;