From 8e242f3d9c45a8131c4fc38bf7d71c9288e2143d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaakko=20Kera=CC=88nen?= Date: Thu, 12 Sep 2019 21:35:04 +0300 Subject: [PATCH] macOS|libgui: Native OS behaviors Use the macOS file dialog for selecting files/folders, and open URLs with /usr/bin/open. --- doomsday/libs/gui/src/dialogs/filedialog_macx.mm | 2 +- doomsday/libs/gui/src/guiapp.cpp | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/doomsday/libs/gui/src/dialogs/filedialog_macx.mm b/doomsday/libs/gui/src/dialogs/filedialog_macx.mm index fa3dead891..7ed1b864f1 100644 --- a/doomsday/libs/gui/src/dialogs/filedialog_macx.mm +++ b/doomsday/libs/gui/src/dialogs/filedialog_macx.mm @@ -18,7 +18,7 @@ #include "de/FileDialog" -#if 1 +#if 0 # include "filedialog_x11.cpp" #else diff --git a/doomsday/libs/gui/src/guiapp.cpp b/doomsday/libs/gui/src/guiapp.cpp index 60e11207e1..af61da92e2 100644 --- a/doomsday/libs/gui/src/guiapp.cpp +++ b/doomsday/libs/gui/src/guiapp.cpp @@ -372,7 +372,7 @@ void GuiApp::revealFile(const NativePath &fileOrFolder) // static { DE_ASSERT_FAIL("File revealing not implemented on this platform"); } -#endif + #endif } void GuiApp::openBrowserUrl(const String &url) @@ -381,7 +381,11 @@ void GuiApp::openBrowserUrl(const String &url) { CommandLine({"/usr/bin/x-www-browser", url}).execute(); } -#else + #elif defined (MACOSX) + { + CommandLine({"/usr/bin/open", url}).execute(); + } + #else { DE_ASSERT_FAIL("Browser URL opening not implemented on this platform"); }