diff options
| author | Damien Zammit <damien@zamaudio.com> | 2015-02-23 10:48:48 +1100 |
|---|---|---|
| committer | Damien Zammit <damien@zamaudio.com> | 2015-02-23 10:48:48 +1100 |
| commit | 29454327ae8ef2f6d633e510599e53b8bc34497d (patch) | |
| tree | 3cc09dd476a28fb4253dd10ff1a9b7e5b8a94484 | |
| parent | 78883fa7f7ea9d85477a27ed3c569a899ee305fb (diff) | |
| parent | d291dc29b4bc837717703c8ae4b5c351c4a7cf96 (diff) | |
Merge pull request #25 from falkTX/master
Fix some minor file-browser issues
| -rw-r--r-- | libs/dgl/src/Window.cpp | 5 | ||||
| -rw-r--r-- | libs/dgl/src/pugl/pugl_x11.c | 6 |
2 files changed, 11 insertions, 0 deletions
diff --git a/libs/dgl/src/Window.cpp b/libs/dgl/src/Window.cpp index c901ff2..f18aff5 100644 --- a/libs/dgl/src/Window.cpp +++ b/libs/dgl/src/Window.cpp @@ -1008,6 +1008,7 @@ void Window::repaint() noexcept bool Window::openFileBrowser(const FileBrowserOptions& options) { +#ifdef SOFD_HAVE_X11 using DISTRHO_NAMESPACE::d_string; // -------------------------------------------------------------------------- @@ -1065,6 +1066,10 @@ bool Window::openFileBrowser(const FileBrowserOptions& options) // show return (x_fib_show(pData->xDisplay, pData->xWindow, /*options.width*/0, /*options.height*/0) == 0); +#else + // not implemented + return false; +#endif } bool Window::isVisible() const noexcept diff --git a/libs/dgl/src/pugl/pugl_x11.c b/libs/dgl/src/pugl/pugl_x11.c index eac570c..d1f68ea 100644 --- a/libs/dgl/src/pugl/pugl_x11.c +++ b/libs/dgl/src/pugl/pugl_x11.c @@ -203,6 +203,8 @@ puglDestroy(PuglView* view) return; } + x_fib_close(view->impl->display); + glXDestroyContext(view->impl->display, view->impl->ctx); XDestroyWindow(view->impl->display, view->impl->win); XCloseDisplay(view->impl->display); @@ -346,6 +348,10 @@ puglProcessEvents(PuglView* view) break; } + if (event.xany.window != view->impl->win) { + continue; + } + switch (event.type) { case MapNotify: puglReshape(view, view->width, view->height); |