Browse Source

Fix transient window on osx (and fixes build)

tags/1.9.8
falkTX 8 years ago
parent
commit
77ed8989bf
2 changed files with 11 additions and 7 deletions
  1. +7
    -4
      source/modules/dgl/src/Window.cpp
  2. +4
    -3
      source/utils/CarlaPluginUI.cpp

+ 7
- 4
source/modules/dgl/src/Window.cpp View File

@@ -137,7 +137,8 @@ struct Window::PrivateData {
hwndParent = parentImpl->hwnd;
SetWindowLongPtr(hwnd, GWLP_HWNDPARENT, (LONG_PTR)hwndParent);
#elif defined(DISTRHO_OS_MAC)
[mWindow orderWindow:NSWindowBelow relativeTo:parentImpl->window];
[parentImpl->window addChildWindow:mWindow
ordered:NSWindowAbove];
#else
XSetTransientForHint(xDisplay, xWindow, parentImpl->win);
#endif
@@ -640,9 +641,11 @@ struct Window::PrivateData {
hwndParent = (HWND)winId;
SetWindowLongPtr(hwnd, GWLP_HWNDPARENT, (LONG_PTR)winId);
#elif defined(DISTRHO_OS_MAC)
NSWindow* const window = [NSApp windowWithWindowNumber:winId];
DISTRHO_SAFE_ASSERT_RETURN(window != nullptr,);
[mWindow orderWindow:NSWindowBelow relativeTo:window];
NSWindow* const parentWindow = [NSApp windowWithWindowNumber:winId];
DISTRHO_SAFE_ASSERT_RETURN(parentWindow != nullptr,);

[parentWindow addChildWindow:mWindow
ordered:NSWindowAbove];
#else
XSetTransientForHint(xDisplay, xWindow, static_cast< ::Window>(winId));
#endif


+ 4
- 3
source/utils/CarlaPluginUI.cpp View File

@@ -555,10 +555,11 @@ public:
{
CARLA_SAFE_ASSERT_RETURN(fWindow != 0,);

NSWindow* window = [NSApp windowWithWindowNumber:winId];
CARLA_SAFE_ASSERT_RETURN(window != nullptr,);
NSWindow* const parentWindow = [NSApp windowWithWindowNumber:winId];
CARLA_SAFE_ASSERT_RETURN(parentWindow != nullptr,);

[fWindow orderWindow:NSWindowBelow relativeTo:window];
[parentWindow addChildWindow:fWindow
ordered:NSWindowAbove];
}

void setChildWindow(void* const winId) override


Loading…
Cancel
Save