Browse Source

tags/2021-05-28
jules 17 years ago
parent
commit
fa2683eb17
3 changed files with 12 additions and 7 deletions
  1. +5
    -3
      build/macosx/platform_specific_code/juce_mac_NSViewComponentPeer.mm
  2. +2
    -1
      extras/audio plugins/wrapper/formats/VST/juce_VstWrapper.cpp
  3. +5
    -3
      juce_amalgamated.cpp

+ 5
- 3
build/macosx/platform_specific_code/juce_mac_NSViewComponentPeer.mm View File

@@ -681,12 +681,15 @@ NSViewComponentPeer::NSViewComponentPeer (Component* const component,
window = [viewToAttachTo window];
[viewToAttachTo addSubview: view];
isSharedWindow = true;
setVisible (component->isVisible());
}
else
{
isSharedWindow = false;
r.origin.x = (float) component->getX();
r.origin.y = (float) component->getY();
r.origin.y = [[NSScreen mainScreen] frame].size.height - (r.origin.y + r.size.height);
unsigned int style = 0;
if ((windowStyleFlags & windowHasTitleBar) == 0)
@@ -709,6 +712,7 @@ NSViewComponentPeer::NSViewComponentPeer (Component* const component,
defer: YES ];
[((JuceNSWindow*) window) setOwner: this];
[window orderOut: nil];
[window setDelegate: window];
[window setOpaque: component->isOpaque()];
[window setHasShadow: ((windowStyleFlags & windowHasDropShadow) != 0)];
@@ -723,8 +727,6 @@ NSViewComponentPeer::NSViewComponentPeer (Component* const component,
[window setExcludedFromWindowsMenu: (windowStyleFlags & windowIsTemporary) != 0];
[window setIgnoresMouseEvents: (windowStyleFlags & windowIgnoresMouseClicks) != 0];
}
setVisible (component->isVisible());
}
NSViewComponentPeer::~NSViewComponentPeer()
@@ -998,7 +1000,7 @@ void NSViewComponentPeer::toFront (bool makeActiveWindow)
relativeTo: nil];
}
if (window != 0)
if (window != 0 && component->isVisible())
{
if (makeActiveWindow)
[window makeKeyAndOrderFront: nil];


+ 2
- 1
extras/audio plugins/wrapper/formats/VST/juce_VstWrapper.cpp View File

@@ -626,7 +626,8 @@ public:
filter->setNonRealtime (getCurrentProcessLevel() == 4 /* kVstProcessLevelOffline */);
#if JUCE_WIN32
if (GetThreadPriority (GetCurrentThread()) <= THREAD_PRIORITY_NORMAL)
if (GetThreadPriority (GetCurrentThread()) <= THREAD_PRIORITY_NORMAL
&& GetThreadPriority (GetCurrentThread()) >= THREAD_PRIORITY_LOWEST)
filter->setNonRealtime (true);
#endif
}


+ 5
- 3
juce_amalgamated.cpp View File

@@ -265166,12 +265166,15 @@ NSViewComponentPeer::NSViewComponentPeer (Component* const component,
window = [viewToAttachTo window];
[viewToAttachTo addSubview: view];
isSharedWindow = true;

setVisible (component->isVisible());
}
else
{
isSharedWindow = false;
r.origin.x = (float) component->getX();
r.origin.y = (float) component->getY();
r.origin.y = [[NSScreen mainScreen] frame].size.height - (r.origin.y + r.size.height);

unsigned int style = 0;
if ((windowStyleFlags & windowHasTitleBar) == 0)
@@ -265194,6 +265197,7 @@ NSViewComponentPeer::NSViewComponentPeer (Component* const component,
defer: YES ];

[((JuceNSWindow*) window) setOwner: this];
[window orderOut: nil];
[window setDelegate: window];
[window setOpaque: component->isOpaque()];
[window setHasShadow: ((windowStyleFlags & windowHasDropShadow) != 0)];
@@ -265208,8 +265212,6 @@ NSViewComponentPeer::NSViewComponentPeer (Component* const component,
[window setExcludedFromWindowsMenu: (windowStyleFlags & windowIsTemporary) != 0];
[window setIgnoresMouseEvents: (windowStyleFlags & windowIgnoresMouseClicks) != 0];
}

setVisible (component->isVisible());
}

NSViewComponentPeer::~NSViewComponentPeer()
@@ -265482,7 +265484,7 @@ void NSViewComponentPeer::toFront (bool makeActiveWindow)
relativeTo: nil];
}

if (window != 0)
if (window != 0 && component->isVisible())
{
if (makeActiveWindow)
[window makeKeyAndOrderFront: nil];


Loading…
Cancel
Save