Document theme color saturation preference

3 files changed, 77 insertions, 57 deletions

diff --git a/src/app.c b/src/app.c
index 9c1ec7a4..0a9acd21 100644
--- a/src/app.c
+++ b/src/app.c
@@ -164,6 +164,7 @@ static iString *serializePrefs_App_(const iApp *d) {
     appendFormat_String(str, "zoom.set arg:%d\n", d->prefs.zoomPercent);
     appendFormat_String(str, "theme.set arg:%d auto:1\n", d->prefs.theme);
     appendFormat_String(str, "ostheme arg:%d\n", d->prefs.useSystemTheme);
+    appendFormat_String(str, "saturation.set arg:%d\n", (int) ((d->prefs.saturation * 100) + 0.5f));
     appendFormat_String(str, "proxy.gopher address:%s\n", cstr_String(&d->prefs.gopherProxy));
     appendFormat_String(str, "proxy.http address:%s\n", cstr_String(&d->prefs.httpProxy));
     appendFormat_String(str, "downloads path:%s\n", cstr_String(&d->prefs.downloadDir));
@@ -799,7 +800,58 @@ iBool handleCommand_App(const char *cmd) {
         d->prefs.retainWindowSize = arg_Command(cmd);
         return iTrue;
     }
-    else if (equal_Command(cmd, "downloads")) {
+    else if (equal_Command(cmd, "zoom.set")) {
+        setFreezeDraw_Window(get_Window(), iTrue); /* no intermediate draws before docs updated */
+        d->prefs.zoomPercent = arg_Command(cmd);
+        setContentFontSize_Text((float) d->prefs.zoomPercent / 100.0f);
+        postCommand_App("font.changed");
+        postCommand_App("window.unfreeze");
+        return iTrue;
+    }
+    else if (equal_Command(cmd, "zoom.delta")) {
+        setFreezeDraw_Window(get_Window(), iTrue); /* no intermediate draws before docs updated */
+        int delta = arg_Command(cmd);
+        if (d->prefs.zoomPercent < 100 || (delta < 0 && d->prefs.zoomPercent == 100)) {
+            delta /= 2;
+        }
+        d->prefs.zoomPercent = iClamp(d->prefs.zoomPercent + delta, 50, 200);
+        setContentFontSize_Text((float) d->prefs.zoomPercent / 100.0f);
+        postCommand_App("font.changed");
+        postCommand_App("window.unfreeze");
+        return iTrue;
+    }
+    else if (equal_Command(cmd, "forcewrap.toggle")) {
+        d->prefs.forceLineWrap = !d->prefs.forceLineWrap;
+        updateSize_DocumentWidget(document_App());
+        return iTrue;
+    }
+    else if (equal_Command(cmd, "theme.set")) {
+        const int isAuto = argLabel_Command(cmd, "auto");
+        d->prefs.theme = arg_Command(cmd);
+        if (!isAuto) {
+            postCommand_App("ostheme arg:0");
+        }
+        setThemePalette_Color(d->prefs.theme);
+        postCommandf_App("theme.changed auto:%d", isAuto);
+        return iTrue;
+    }
+    else if (equal_Command(cmd, "ostheme")) {
+        d->prefs.useSystemTheme = arg_Command(cmd);
+        return iTrue;
+    }
+    else if (equal_Command(cmd, "saturation.set")) {
+        d->prefs.saturation = (float) arg_Command(cmd) / 100.0f;
+        postCommandf_App("theme.changed auto:1");
+        return iTrue;
+    }
+    else if (equal_Command(cmd, "proxy.gopher")) {
+        setCStr_String(&d->prefs.gopherProxy, suffixPtr_Command(cmd, "address"));
+        return iTrue;
+    }
+    else if (equal_Command(cmd, "proxy.http")) {
+        setCStr_String(&d->prefs.httpProxy, suffixPtr_Command(cmd, "address"));
+        return iTrue;
+    }    else if (equal_Command(cmd, "downloads")) {
         setCStr_String(&d->prefs.downloadDir, suffixPtr_Command(cmd, "path"));
         return iTrue;
     }
@@ -936,31 +988,6 @@ iBool handleCommand_App(const char *cmd) {
         }
         return iTrue;
     }
-    else if (equal_Command(cmd, "zoom.set")) {
-        setFreezeDraw_Window(get_Window(), iTrue); /* no intermediate draws before docs updated */
-        d->prefs.zoomPercent = arg_Command(cmd);
-        setContentFontSize_Text((float) d->prefs.zoomPercent / 100.0f);
-        postCommand_App("font.changed");
-        postCommand_App("window.unfreeze");
-        return iTrue;
-    }
-    else if (equal_Command(cmd, "zoom.delta")) {
-        setFreezeDraw_Window(get_Window(), iTrue); /* no intermediate draws before docs updated */
-        int delta = arg_Command(cmd);
-        if (d->prefs.zoomPercent < 100 || (delta < 0 && d->prefs.zoomPercent == 100)) {
-            delta /= 2;
-        }
-        d->prefs.zoomPercent = iClamp(d->prefs.zoomPercent + delta, 50, 200);
-        setContentFontSize_Text((float) d->prefs.zoomPercent / 100.0f);
-        postCommand_App("font.changed");
-        postCommand_App("window.unfreeze");
-        return iTrue;
-    }
-    else if (equal_Command(cmd, "forcewrap.toggle")) {
-        d->prefs.forceLineWrap = !d->prefs.forceLineWrap;
-        updateSize_DocumentWidget(document_App());
-        return iTrue;
-    }
     else if (equal_Command(cmd, "bookmark.add")) {
         iDocumentWidget *doc = document_App();
         makeBookmarkCreation_Widget(url_DocumentWidget(doc),
@@ -995,20 +1022,6 @@ iBool handleCommand_App(const char *cmd) {
         postCommand_App("idents.changed");
         return iTrue;
     }
-    else if (equal_Command(cmd, "theme.set")) {
-        const int isAuto = argLabel_Command(cmd, "auto");
-        d->prefs.theme = arg_Command(cmd);
-        if (!isAuto) {
-            postCommand_App("ostheme arg:0");
-        }
-        setThemePalette_Color(d->prefs.theme);
-        postCommandf_App("theme.changed auto:%d", isAuto);
-        return iTrue;
-    }
-    else if (equal_Command(cmd, "ostheme")) {
-        d->prefs.useSystemTheme = arg_Command(cmd);
-        return iTrue;
-    }
     else if (equal_Command(cmd, "os.theme.changed")) {
         if (d->prefs.useSystemTheme) {
             const int dark     = argLabel_Command(cmd, "dark");
@@ -1019,14 +1032,6 @@ iBool handleCommand_App(const char *cmd) {
         }
         return iFalse;
     }
-    else if (equal_Command(cmd, "proxy.gopher")) {
-        setCStr_String(&d->prefs.gopherProxy, suffixPtr_Command(cmd, "address"));
-        return iTrue;
-    }
-    else if (equal_Command(cmd, "proxy.http")) {
-        setCStr_String(&d->prefs.httpProxy, suffixPtr_Command(cmd, "address"));
-        return iTrue;
-    }
     else {
         return iFalse;
     }
diff --git a/src/gmdocument.c b/src/gmdocument.c
index 0129db64..4414b04f 100644
--- a/src/gmdocument.c
+++ b/src/gmdocument.c
@@ -897,7 +897,9 @@ void setThemeSeed_GmDocument(iGmDocument *d, const iBlock *seed) {
                 }
             }
             /* Modify overall saturation. */
-            color.sat *= prefs->saturation;
+            if (!isLink_ColorId(i)) {
+                color.sat *= prefs->saturation;
+            }
             setHsl_Color(i, color);
         }
     }
diff --git a/src/ui/util.c b/src/ui/util.c
index 52107d81..c341a11d 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -843,9 +843,6 @@ static void expandInputFieldWidth_(iInputWidget *input) {
     iWidget *page = as_Widget(input)->parent->parent->parent->parent; /* tabs > page > values > input */
     as_Widget(input)->rect.size.x =
         right_Rect(bounds_Widget(page)) - left_Rect(bounds_Widget(constAs_Widget(input)));
-    printf("expand to %s, %d - %d\n", cstr_String(id_Widget(page)),
-           right_Rect(bounds_Widget(page)), left_Rect(bounds_Widget(constAs_Widget(input))));
-    fflush(stdout);
 }
 
 iWidget *makePreferences_Widget(void) {
@@ -881,18 +878,34 @@ iWidget *makePreferences_Widget(void) {
     /* Layout. */ {
         appendTwoColumnPage_(tabs, "Layout", &headings, &values);
         addChild_Widget(headings, iClob(makeHeading_Widget("Line width:")));
-        addChild_Widget(values, iClob(new_LabelWidget("Normal", 0, 0, NULL)));
-        addChild_Widget(headings, iClob(makeHeading_Widget("First paragaph:")));
-        addChild_Widget(values, iClob(new_LabelWidget("Emphasized", 0, 0, NULL)));
+        iWidget *widths = new_Widget();
+        /* Line widths. */ {
+            addChild_Widget(widths, iClob(new_LabelWidget("\u20132", 0, 0, "linewidth.set arg:-2")));
+            addChild_Widget(widths, iClob(new_LabelWidget("\u20131", 0, 0, "linewidth.set arg:-1")));
+            addChild_Widget(widths, iClob(new_LabelWidget("Normal", 0, 0, "linewidth.set arg:0")));
+            addChild_Widget(widths, iClob(new_LabelWidget("+1", 0, 0, "linewidth.set arg:1")));
+            addChild_Widget(widths, iClob(new_LabelWidget("+2", 0, 0, "linewidth.set arg:2")));
+            addChild_Widget(widths, iClob(new_LabelWidget("Window", 0, 0, "linewidth.set arg:1000")));
+        }
+        addChildFlags_Widget(values, iClob(widths), arrangeHorizontal_WidgetFlag | arrangeSize_WidgetFlag);
+        addChild_Widget(headings, iClob(makeHeading_Widget("Big 1st paragaph:")));
+        addChild_Widget(values, iClob(makeToggle_Widget("prefs.biglede")));
     }
     /* Colors. */ {
         appendTwoColumnPage_(tabs, "Colors", &headings, &values);
-        addChild_Widget(headings, iClob(makeHeading_Widget("Saturation:")));
-        addChild_Widget(values, iClob(new_LabelWidget("Full", 0, 0, 0)));
         addChild_Widget(headings, iClob(makeHeading_Widget("Dark theme:")));
         addChild_Widget(values, iClob(new_LabelWidget("Colorful", 0, 0, 0)));
         addChild_Widget(headings, iClob(makeHeading_Widget("Light theme:")));
         addChild_Widget(values, iClob(new_LabelWidget("White", 0, 0, 0)));
+        addChild_Widget(headings, iClob(makeHeading_Widget("Saturation:")));
+        iWidget *sats = new_Widget();
+        /* Saturation levels. */ {
+            addChild_Widget(sats, iClob(new_LabelWidget("Full", 0, 0, "saturation.set arg:100")));
+            addChild_Widget(sats, iClob(new_LabelWidget("Reduced", 0, 0, "saturation.set arg:66")));
+            addChild_Widget(sats, iClob(new_LabelWidget("Minimal", 0, 0, "saturation.set arg:33")));
+            addChild_Widget(sats, iClob(new_LabelWidget("Monochrome", 0, 0, "saturation.set arg:0")));
+        }
+        addChildFlags_Widget(values, iClob(sats), arrangeHorizontal_WidgetFlag | arrangeSize_WidgetFlag);
     }
     /* Proxies. */ {
         appendTwoColumnPage_(tabs, "Proxies", &headings, &values);