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

Fixed a bug in iOS and Windows multi-touch code where touches on different windows weren't aware of each other

Browse source
This commit is contained in:
ed 2017-06-19 16:28:55 +01:00
parent f866b4ff5e
commit 940ff3ee6e
2 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
modules/juce_gui_basics/native/juce_ios_UIViewComponentPeer.mm
View file

@ -285,7 +285,7 @@ public:
return r;
}
MultiTouchMapper<UITouch*> currentTouches;
static MultiTouchMapper<UITouch*> currentTouches;
private:
JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (UIViewComponentPeer)
@ -324,6 +324,8 @@ static bool isKioskModeView (JuceUIViewController* c)
return Desktop::getInstance().getKioskModeComponent() == &(juceView->owner->getComponent());
}
MultiTouchMapper<UITouch*> UIViewComponentPeer::currentTouches;
} // (juce namespace)

5
modules/juce_gui_basics/native/juce_win32_Windowing.cpp
View file

@ -1461,11 +1461,12 @@ private:
FileDropTarget* dropTarget = nullptr;
uint8 updateLayeredWindowAlpha = 255;
UWPUIViewSettings uwpViewSettings;
MultiTouchMapper<DWORD> currentTouches;
#if JUCE_MODULE_AVAILABLE_juce_audio_plugin_client
ModifierKeyProvider* modProvider = nullptr;
#endif
static MultiTouchMapper<DWORD> currentTouches;
//==============================================================================
struct TemporaryImage : private Timer
{
@ -3499,6 +3500,8 @@ private:
ModifierKeys HWNDComponentPeer::currentModifiers;
ModifierKeys HWNDComponentPeer::modifiersAtLastCallback;
MultiTouchMapper<DWORD> HWNDComponentPeer::currentTouches;
ComponentPeer* Component::createNewPeer (int styleFlags, void* parentHWND)
{
return new HWNDComponentPeer (*this, styleFlags, (HWND) parentHWND, false);