mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-10 23:44:24 +00:00
Code Activity

Windowing: Respect modal state and enablement for native titlebar buttons

Browse source
This commit is contained in:
reuk 2024-06-04 14:54:14 +01:00
parent f26cce5a46
commit eca3e074e5
No known key found for this signature in database
GPG key ID: FCB43929F012EE5C
1 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

16
modules/juce_gui_basics/native/juce_Windowing_windows.cpp
View file

@ -2788,7 +2788,7 @@ private:
}
}
void doMouseUp (Point<float> position, const WPARAM wParam)
void doMouseUp (Point<float> position, const WPARAM wParam, bool adjustCapture = true)
{
// this will be handled by WM_TOUCH
if (isTouchEvent() || areOtherTouchSourcesActive())
@ -2805,7 +2805,7 @@ private:
isDragging = false;
// release the mouse capture if the user has released all buttons
if ((wParam & (MK_LBUTTON | MK_RBUTTON | MK_MBUTTON)) == 0 && hwnd == GetCapture())
if (adjustCapture && (wParam & (MK_LBUTTON | MK_RBUTTON | MK_MBUTTON)) == 0 && hwnd == GetCapture())
ReleaseCapture();
// NB: under some circumstances (e.g. double-clicking a native title bar), a mouse-up can
@ -2828,7 +2828,7 @@ private:
renderContext->setResizing (false);
if (isDragging)
doMouseUp (getCurrentMousePos(), (WPARAM) 0);
doMouseUp (getCurrentMousePos(), (WPARAM) 0, false);
}
void doMouseExit()
@ -3810,7 +3810,9 @@ private:
case WM_POINTERHWHEEL:
case 0x020E: /* WM_MOUSEHWHEEL */ doMouseWheel (wParam, false); return 0;
case WM_CAPTURECHANGED: doCaptureChanged(); return 0;
case WM_CAPTURECHANGED:
doCaptureChanged();
return 0;
case WM_TOUCH:
if (getTouchInputInfo != nullptr)
@ -4097,11 +4099,13 @@ private:
return 0;
case HTMAXBUTTON:
setFullScreen (! isFullScreen());
if ((styleFlags & windowHasMaximiseButton) != 0 && ! sendInputAttemptWhenModalMessage())
setFullScreen (! isFullScreen());
return 0;
case HTMINBUTTON:
setMinimised (true);
if ((styleFlags & windowHasMinimiseButton) != 0 && ! sendInputAttemptWhenModalMessage())
setMinimised (true);
return 0;
}
break;