Browse Source

tags/2021-05-28
jules 18 years ago
parent
commit
bd72cbe033
2 changed files with 27 additions and 19 deletions
  1. +20
    -12
      build/macosx/platform_specific_code/juce_mac_Windowing.cpp
  2. +7
    -7
      extras/audio plugins/demo/build/AudioUnit/JuceDemoAU.xcodeproj/project.pbxproj

+ 20
- 12
build/macosx/platform_specific_code/juce_mac_Windowing.cpp View File

@@ -1153,17 +1153,25 @@ public:
const bool used1 = handleKeyUpOrDown();
const bool used2 = handleKeyPress (keyCode, textCharacter);

return (used1 || used2) ? noErr : eventNotHandledErr;
if (used1 || used2)
return noErr;

break;
}

case kEventRawKeyUp:
keysCurrentlyDown.removeValue ((void*) keyCode);
lastTextCharacter = 0;
return handleKeyUpOrDown() ? noErr : eventNotHandledErr;
if (handleKeyUpOrDown())
return noErr;

break;

case kEventRawKeyRepeat:
return handleKeyPress (keyCode, lastTextCharacter) ? noErr
: eventNotHandledErr;
if (handleKeyPress (keyCode, lastTextCharacter))
return noErr;

break;

case kEventRawKeyModifiersChanged:
handleModifierKeysChange();
@@ -2228,11 +2236,11 @@ void Desktop::setMousePosition (int x, int y) throw()
{
// this rubbish needs to be done around the warp call, to avoid causing a
// bizarre glitch..
CGAssociateMouseAndMouseCursorPosition (false);
CGSetLocalEventsSuppressionInterval (0);
CGAssociateMouseAndMouseCursorPosition (false);
CGSetLocalEventsSuppressionInterval (0);
CGPoint pos = { x, y };
CGWarpMouseCursorPosition (pos);
CGWarpMouseCursorPosition (pos);

CGAssociateMouseAndMouseCursorPosition (true);
}
@@ -2275,10 +2283,10 @@ void juce_updateMultiMonitorInfo (Array <Rectangle>& monitorCoords, const bool c
{
const CGRect r (CGDisplayBounds (disps[i]));

monitorCoords.add (Rectangle (r.origin.x,
r.origin.y,
r.size.width,
r.size.height));
monitorCoords.add (Rectangle ((int) r.origin.x,
(int) r.origin.y,
(int) r.size.width,
(int) r.size.height));
}
}
}


+ 7
- 7
extras/audio plugins/demo/build/AudioUnit/JuceDemoAU.xcodeproj/project.pbxproj View File

@@ -60,7 +60,7 @@
84F055040906E9EA00AEC8DB /* DemoJuceFilter.h in Headers */ = {isa = PBXBuildFile; fileRef = 84F055000906E9EA00AEC8DB /* DemoJuceFilter.h */; };
84F055260906FBCF00AEC8DB /* AUSilentTimeout.h in Headers */ = {isa = PBXBuildFile; fileRef = 84F055250906FBCF00AEC8DB /* AUSilentTimeout.h */; };
84F87963093B1EDC00225D65 /* AGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84F87962093B1EDC00225D65 /* AGL.framework */; };
84FDAFE90C15B9E200CD0087 /* libjuce.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 84FDAFBD0C15B8F100CD0087 /* libjuce.a */; };
84FDAFE90C15B9E200CD0087 /* libjucedebug.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 84FDAFBD0C15B8F100CD0087 /* libjucedebug.a */; };
A9E885EA0874B5BF00B2DFE8 /* CAThreadSafeList.h in Headers */ = {isa = PBXBuildFile; fileRef = A9E885E90874B5BF00B2DFE8 /* CAThreadSafeList.h */; };
F4E5DC2C0898301D00589A5A /* CAVectorUnit.h in Headers */ = {isa = PBXBuildFile; fileRef = F4E5DC290898301D00589A5A /* CAVectorUnit.h */; };
F4E5DC2D0898301D00589A5A /* CAVectorUnitTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = F4E5DC2A0898301D00589A5A /* CAVectorUnitTypes.h */; };
@@ -79,8 +79,8 @@
/* Begin PBXCopyFilesBuildPhase section */
84CFB0240909684B0053C22C /* CopyFiles */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
dstPath = "~/Library/Audio/Plug-Ins/Components";
buildActionMask = 12;
dstPath = "$HOME/Library/Audio/Plug-Ins/Components";
dstSubfolderSpec = 0;
files = (
84CFB029090968590053C22C /* DemoJuceAudioUnit.component in CopyFiles */,
@@ -161,7 +161,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
84FDAFE90C15B9E200CD0087 /* libjuce.a in Frameworks */,
84FDAFE90C15B9E200CD0087 /* libjucedebug.a in Frameworks */,
84CFAFEB0909666C0053C22C /* AudioToolbox.framework in Frameworks */,
3E8BF11F079CA60300021B09 /* CoreFoundation.framework in Frameworks */,
3E8BF120079CA60300021B09 /* CoreServices.framework in Frameworks */,
@@ -215,7 +215,7 @@
84FDAFB90C15B8F100CD0087 /* Products */ = {
isa = PBXGroup;
children = (
84FDAFBD0C15B8F100CD0087 /* libjuce.a */,
84FDAFBD0C15B8F100CD0087 /* libjucedebug.a */,
);
name = Products;
sourceTree = "<group>";
@@ -439,10 +439,10 @@
/* End PBXProject section */

/* Begin PBXReferenceProxy section */
84FDAFBD0C15B8F100CD0087 /* libjuce.a */ = {
84FDAFBD0C15B8F100CD0087 /* libjucedebug.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = libjuce.a;
path = libjucedebug.a;
remoteRef = 84FDAFBC0C15B8F100CD0087 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};


Loading…
Cancel
Save