From 4905b03372306dd19d16cfa5f9d126f982823ea2 Mon Sep 17 00:00:00 2001
From: Richard Barber <kd6kxr@gmail.com>
Date: Sun, 16 Feb 2020 23:47:44 -0800
Subject: [PATCH] mac: add some comments

---
 rtdata/options/options.osx | 1 +
 rtgui/options.cc           | 6 +++---
 tools/osx/Info.plist.in    | 4 ++++
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/rtdata/options/options.osx b/rtdata/options/options.osx
index bffd48495..9c1cb4c92 100644
--- a/rtdata/options/options.osx
+++ b/rtdata/options/options.osx
@@ -39,5 +39,6 @@ CustomProfileBuilder=
 #ImgDefault=Neutral
 
 [GUI]
+# Set the included font as default
 FontFamily=DroidSansMonoSlashed Regular
 CPFontFamily=DroidSansMonoSlashed Regular
diff --git a/rtgui/options.cc b/rtgui/options.cc
index 9bf1302ed..7625e6620 100644
--- a/rtgui/options.cc
+++ b/rtgui/options.cc
@@ -2274,9 +2274,9 @@ void Options::load(bool lightweight)
     // Build Application Support directory path for macOS.
     const gchar* homedir;
     const gchar* configdir;
-    homedir = g_getenv("HOME"); // This returns the current container
+    homedir = g_getenv("HOME"); // This returns the current container data dir in ~/Library
     std::cout << "homedir=" << homedir << "\n";
-    configdir = "/../../../Application Support/RawTherapee/config";
+    configdir = "/../../../Application Support/RawTherapee/config"; // Back out of containers and into App. Support
     int bufferSize = strlen(homedir) + strlen(configdir) + 1;
     gchar* concatString = new gchar[ bufferSize ];
     strcpy( concatString, homedir );
@@ -2331,7 +2331,7 @@ void Options::load(bool lightweight)
     // Modify the path of the cache folder to the one provided in RT_CACHE environment variable. Build the cache folder name in macOS.
 #ifdef __APPLE__
     const gchar* cachedir;
-    cachedir = "/../../../Application Support/RawTherapee/cache";
+    cachedir = "/../../../Application Support/RawTherapee/cache";  // Back out of containers and into App. Support
     int bufferSize2 = strlen(homedir) + strlen(cachedir) + 1;  //reuse homedir from above.
     gchar* concatString2 = new gchar[ bufferSize2 ];
     strcpy( concatString2, homedir );
diff --git a/tools/osx/Info.plist.in b/tools/osx/Info.plist.in
index cc445c1b0..ee11ba6d7 100644
--- a/tools/osx/Info.plist.in
+++ b/tools/osx/Info.plist.in
@@ -12,6 +12,8 @@
             <string>/Applications/RawTherapee.app/Contents/Frameworks</string>
             <key>GTK_IM_MODULE_FILE</key>
             <string>/Applications/RawTherapee.app/Contents/Resources/etc/gtk-3.0/gtk.immodules</string>
+            <key>GTK_MODULES</key>
+            <string>/Applications/RawTherapee.app/Contents/Frameworks/im-quartz.so</string>
             <key>XDG_DATA_HOME</key>
             <string>/Applications/RawTherapee.app/Contents/Resources/share</string>
             <key>GSETTINGS_SCHEMA_DIR</key>
@@ -30,6 +32,8 @@
             <string>similar</string>
             <key>GTK_OVERLAY_SCROLLING</key>
             <string>0</string>
+            <key>GDK_NATIVE_WINDOWS</key>
+            <string>1</string>
         </dict>
         <key>ATSApplicationFontsPath</key>
         <string>etc/fonts</string>