5 files changed, 27 insertions, 1 deletions

diff --git a/src/macos.m b/src/macos.m
index 78b964ae..658acb05 100644
--- a/src/macos.m
+++ b/src/macos.m
@@ -684,3 +684,11 @@ void showPopupMenu_MacOS(iWidget *source, iInt2 windowCoord, const iMenuItem *it
     }
 }
 
+iColor systemAccent_Color(void) {
+    NSColor *accent = [[NSColor controlAccentColor] colorUsingColorSpace:
+                                                        [NSColorSpace deviceRGBColorSpace]];
+    return (iColor){ iClamp([accent redComponent]   * 255, 0, 255),
+                     iClamp([accent greenComponent] * 255, 0, 255),
+                     iClamp([accent blueComponent]  * 255, 0, 255),
+                     255 };
+}
diff --git a/src/prefs.h b/src/prefs.h
index 87c9a6e6..37aeb260 100644
--- a/src/prefs.h
+++ b/src/prefs.h
@@ -43,7 +43,7 @@ struct Impl_Prefs {
     /* Window */
     iString          uiLanguage;
     iBool            useSystemTheme;
-    enum iColorTheme theme;
+    enum iColorTheme theme;    
     enum iColorAccent accent;
     iBool            customFrame; /* when LAGRANGE_ENABLE_CUSTOM_FRAME is defined */
     iBool            retainWindowSize;
diff --git a/src/ui/color.c b/src/ui/color.c
index 9da49531..4f275ae5 100644
--- a/src/ui/color.c
+++ b/src/ui/color.c
@@ -81,6 +81,11 @@ iLocalDef void copy_(enum iColorId dst, enum iColorId src) {
 void setThemePalette_Color(enum iColorTheme theme) {
     const iPrefs *prefs = prefs_App();
     memcpy(uiPalette_, isDark_ColorTheme(theme) ? darkPalette_ : lightPalette_, sizeof(darkPalette_));
+    if (prefs->accent == system_ColorAccent) {
+        iColor systemColor = systemAccent_Color();
+        memcpy(&uiPalette_[cyan_ColorId], &systemColor, sizeof(iColor));
+        memcpy(&uiPalette_[orange_ColorId], &systemColor, sizeof(iColor));
+    }
     const int accentHi    = (prefs->accent == cyan_ColorAccent ? cyan_ColorId : orange_ColorId);
     const int accentLo    = (prefs->accent == cyan_ColorAccent ? teal_ColorId : brown_ColorId);
     const int altAccentHi = (prefs->accent == cyan_ColorAccent ? orange_ColorId : cyan_ColorId);
@@ -903,3 +908,9 @@ iBool loadPalette_Color(const char *path) {
     iRelease(f);
     return wasLoaded;
 }
+
+#if !defined (iPlatformAppleDesktop)
+iColor systemAccent_Color(void) {
+    return (iColor){ 255, 255, 255, 255 };
+}
+#endif
diff --git a/src/ui/color.h b/src/ui/color.h
index b6571c86..179db3e9 100644
--- a/src/ui/color.h
+++ b/src/ui/color.h
@@ -36,6 +36,7 @@ enum iColorTheme {
 enum iColorAccent {
     cyan_ColorAccent,
     orange_ColorAccent,
+    system_ColorAccent,
     max_ColorAccent
 };
 
@@ -251,3 +252,5 @@ void            setThemePalette_Color   (enum iColorTheme theme);
 iColor          ansiForeground_Color    (iRangecc escapeSequence, int fallback);
 const char *    escape_Color            (int color);
 enum iColorId   parseEscape_Color       (const char *cstr, const char **endp);
+
+iColor          systemAccent_Color      (void); /* platform-specific impl */
diff --git a/src/ui/util.c b/src/ui/util.c
index 872a91ab..2a0c89dc 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -2416,6 +2416,10 @@ iWidget *makePreferences_Widget(void) {
         iWidget *accent = new_Widget(); {
             setId_Widget(addChild_Widget(accent, iClob(new_LabelWidget("${prefs.accent.teal}", "accent.set arg:0"))), "prefs.accent.0");
             setId_Widget(addChild_Widget(accent, iClob(new_LabelWidget("${prefs.accent.orange}", "accent.set arg:1"))), "prefs.accent.1");
+#if defined (iPlatformApple)
+            /* TODO: Needs some tweaking. */
+//            setId_Widget(addChild_Widget(accent, iClob(new_LabelWidget("${prefs.accent.system}", "accent.set arg:2"))), "prefs.accent.2");
+#endif
         }
         addChild_Widget(headings, iClob(makeHeading_Widget("${prefs.accent}")));
         addChildFlags_Widget(values, iClob(accent), arrangeHorizontal_WidgetFlag | arrangeSize_WidgetFlag);