6 files changed, 24 insertions, 10 deletions

diff --git a/src/app.c b/src/app.c
index daf3d102..3d3dc6f8 100644
--- a/src/app.c
+++ b/src/app.c
@@ -215,6 +215,7 @@ static iString *serializePrefs_App_(const iApp *d) {
     appendFormat_String(str, "linewidth.set arg:%d\n", d->prefs.lineWidth);
     appendFormat_String(str, "prefs.biglede.changed arg:%d\n", d->prefs.bigFirstParagraph);
     appendFormat_String(str, "prefs.sideicon.changed arg:%d\n", d->prefs.sideIcon);
+    appendFormat_String(str, "prefs.centershort.changed arg:%d\n", d->prefs.centerShortDocs);
     appendFormat_String(str, "quoteicon.set arg:%d\n", d->prefs.quoteIcon ? 1 : 0);
     appendFormat_String(str, "prefs.hoverlink.changed arg:%d\n", d->prefs.hoverLink);
     appendFormat_String(str, "theme.set arg:%d auto:1\n", d->prefs.theme);
@@ -1264,6 +1265,11 @@ iBool handleCommand_App(const char *cmd) {
         postRefresh_App();
         return iTrue;
     }
+    else if (equal_Command(cmd, "prefs.centershort.changed")) {
+        d->prefs.centerShortDocs = arg_Command(cmd) != 0;
+        postCommand_App("theme.changed");
+        return iTrue;
+    }
     else if (equal_Command(cmd, "prefs.hoverlink.changed")) {
         d->prefs.hoverLink = arg_Command(cmd) != 0;
         postRefresh_App();
@@ -1457,6 +1463,7 @@ iBool handleCommand_App(const char *cmd) {
             iTrue);
         setToggle_Widget(findChild_Widget(dlg, "prefs.biglede"), d->prefs.bigFirstParagraph);
         setToggle_Widget(findChild_Widget(dlg, "prefs.sideicon"), d->prefs.sideIcon);
+        setToggle_Widget(findChild_Widget(dlg, "prefs.centershort"), d->prefs.centerShortDocs);
         updateColorThemeButton_(findChild_Widget(dlg, "prefs.doctheme.dark"), d->prefs.docThemeDark);
         updateColorThemeButton_(findChild_Widget(dlg, "prefs.doctheme.light"), d->prefs.docThemeLight);
         setFlags_Widget(
diff --git a/src/prefs.c b/src/prefs.c
index 6af8f1d8..a8f34b02 100644
--- a/src/prefs.c
+++ b/src/prefs.c
@@ -43,6 +43,7 @@ void init_Prefs(iPrefs *d) {
     d->lineWidth         = 38;
     d->bigFirstParagraph = iTrue;
     d->quoteIcon         = iTrue;
+    d->centerShortDocs   = iTrue;
     d->docThemeDark      = colorfulDark_GmDocumentTheme;
     d->docThemeLight     = white_GmDocumentTheme;
     d->saturation        = 1.0f;
diff --git a/src/prefs.h b/src/prefs.h
index de354a04..dcda695f 100644
--- a/src/prefs.h
+++ b/src/prefs.h
@@ -62,6 +62,7 @@ struct Impl_Prefs {
     int              lineWidth;
     iBool            bigFirstParagraph;
     iBool            quoteIcon;
+    iBool            centerShortDocs;
     /* Colors */
     enum iGmDocumentTheme docThemeDark;
     enum iGmDocumentTheme docThemeLight;
diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index e9753fec..603af076 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -332,15 +332,17 @@ static iRect documentBounds_DocumentWidget_(const iDocumentWidget *d) {
         rect.pos.y += margin;
         rect.size.y -= margin;
     }
-    const iInt2 docSize = size_GmDocument(d->doc);
-    if (docSize.y < rect.size.y) {
-        /* Center vertically if short. There is one empty paragraph line's worth of margin
-           between the banner and the page contents. */
-        const int bannerHeight = banner ? height_Rect(banner->visBounds) : 0;
-        int offset = iMax(0, (rect.size.y + margin - docSize.y - bannerHeight -
-                              lineHeight_Text(paragraph_FontId)) / 2);
-        rect.pos.y += offset;
-        rect.size.y = docSize.y;
+    if (prefs_App()->centerShortDocs) {
+        const iInt2 docSize = size_GmDocument(d->doc);
+        if (docSize.y < rect.size.y) {
+            /* Center vertically if short. There is one empty paragraph line's worth of margin
+               between the banner and the page contents. */
+            const int bannerHeight = banner ? height_Rect(banner->visBounds) : 0;
+            int offset = iMax(0, (rect.size.y + margin - docSize.y - bannerHeight -
+                                  lineHeight_Text(paragraph_FontId)) / 2);
+            rect.pos.y += offset;
+            rect.size.y = docSize.y;
+        }
     }
     return rect;
 }
diff --git a/src/ui/util.c b/src/ui/util.c
index 75a770eb..b52dea2d 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -1063,6 +1063,9 @@ iWidget *makePreferences_Widget(void) {
 #endif
         addChild_Widget(headings, iClob(makeHeading_Widget("Show URL on hover:")));
         addChild_Widget(values, iClob(makeToggle_Widget("prefs.hoverlink")));
+        addChild_Widget(headings, iClob(makeHeading_Widget("Vertical centering:")));
+        addChild_Widget(values, iClob(makeToggle_Widget("prefs.centershort")));
+        makeTwoColumnHeading_("SCROLLING", headings, values);
         addChild_Widget(headings, iClob(makeHeading_Widget("Smooth scrolling:")));
         addChild_Widget(values, iClob(makeToggle_Widget("prefs.smoothscroll")));
         addChild_Widget(headings, iClob(makeHeading_Widget("Load image on scroll:")));
diff --git a/src/ui/window.c b/src/ui/window.c
index c5eb7e03..d6a41d3b 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -935,7 +935,7 @@ void init_Window(iWindow *d, iRect rect) {
     if (left_Rect(rect) >= 0 || top_Rect(rect) >= 0) {
         SDL_SetWindowPosition(d->win, left_Rect(rect), top_Rect(rect));
     }
-    const iInt2 minSize = init_I2(425, 300);
+    const iInt2 minSize = init_I2(425, 325);
     SDL_SetWindowMinimumSize(d->win, minSize.x, minSize.y);
     SDL_SetWindowTitle(d->win, "Lagrange");
     /* Some info. */ {