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: Use local coordinate space of component in call to findControlAtPoint

Browse source
This commit is contained in:
reuk 2024-11-26 13:20:29 +00:00
parent 90d9f573c2
commit 81a95abb3c
No known key found for this signature in database
1 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2032,7 +2032,7 @@ public:
} }
HWNDComponentPeer& peer; HWNDComponentPeer& peer;
ComponentPeer::DragInfo dragInfo; DragInfo dragInfo;
bool peerIsDeleted = false; bool peerIsDeleted = false;
private: private:
@ -3740,12 +3740,12 @@ private:
static ModifierKeys getMouseModifiers() static ModifierKeys getMouseModifiers()
{ {
HWNDComponentPeer::updateKeyModifiers(); updateKeyModifiers();
int mouseMods = 0; int mouseMods = 0;
if (HWNDComponentPeer::isKeyDown (VK_LBUTTON)) mouseMods |= ModifierKeys::leftButtonModifier; if (isKeyDown (VK_LBUTTON)) mouseMods |= ModifierKeys::leftButtonModifier;
if (HWNDComponentPeer::isKeyDown (VK_RBUTTON)) mouseMods |= ModifierKeys::rightButtonModifier; if (isKeyDown (VK_RBUTTON)) mouseMods |= ModifierKeys::rightButtonModifier;
if (HWNDComponentPeer::isKeyDown (VK_MBUTTON)) mouseMods |= ModifierKeys::middleButtonModifier; if (isKeyDown (VK_MBUTTON)) mouseMods |= ModifierKeys::middleButtonModifier;
ModifierKeys::currentModifiers = ModifierKeys::currentModifiers.withoutMouseButtons().withFlags (mouseMods); ModifierKeys::currentModifiers = ModifierKeys::currentModifiers.withoutMouseButtons().withFlags (mouseMods);
@ -3796,8 +3796,12 @@ private:
if (const auto result = DefWindowProc (h, message, wParam, lParam); HTSIZEFIRST <= result && result <= HTSIZELAST) if (const auto result = DefWindowProc (h, message, wParam, lParam); HTSIZEFIRST <= result && result <= HTSIZELAST)
return result; return result;
const auto localPoint = getLocalPointFromScreenLParam (lParam).toFloat(); const auto physicalPoint = D2DUtilities::toPoint (getPOINTFromLParam (lParam));
const auto kind = component.findControlAtPoint (localPoint); const auto logicalPoint = convertPhysicalScreenPointToLogical (physicalPoint, hwnd);
const auto localPoint = globalToLocal (logicalPoint.toFloat());
const auto componentPoint = detail::ScalingHelpers::unscaledScreenPosToScaled (component, localPoint);
const auto kind = component.findControlAtPoint (componentPoint);
using Kind = Component::WindowControlKind; using Kind = Component::WindowControlKind;
switch (kind) switch (kind)
@ -4093,7 +4097,7 @@ private:
if (auto* modal = Component::getCurrentlyModalComponent()) if (auto* modal = Component::getCurrentlyModalComponent())
if (auto* peer = modal->getPeer()) if (auto* peer = modal->getPeer())
if ((peer->getStyleFlags() & ComponentPeer::windowIsTemporary) != 0) if ((peer->getStyleFlags() & windowIsTemporary) != 0)
sendInputAttemptWhenModalMessage(); sendInputAttemptWhenModalMessage();
break; break;