6 files changed, 51 insertions, 35 deletions

diff --git a/src/app.c b/src/app.c
index 73771609..63a286f8 100644
--- a/src/app.c
+++ b/src/app.c
@@ -2125,6 +2125,12 @@ void resetFonts_App(void) {
     }
 }
 
+static void invalidateCachedDocuments_App_(void) {
+    iForEach(ObjectList, i, iClob(listDocuments_App(NULL))) {
+        invalidateCachedLayout_History(history_DocumentWidget(i.object));
+    }
+}
+
 iBool handleCommand_App(const char *cmd) {
     iApp *d = &app_;
     const iBool isFrozen = !d->window || d->window->isDrawFrozen;
@@ -2289,7 +2295,10 @@ iBool handleCommand_App(const char *cmd) {
         if (!isFrozen) {
             setFreezeDraw_MainWindow(get_MainWindow(), iTrue); /* no intermediate draws before docs updated */
         }
-        d->prefs.zoomPercent = arg_Command(cmd);
+        if (arg_Command(cmd) != d->prefs.zoomPercent) {
+            d->prefs.zoomPercent = arg_Command(cmd);
+            invalidateCachedDocuments_App_();
+        }
         setDocumentFontSize_Text(text_Window(d->window), (float) d->prefs.zoomPercent / 100.0f);
         if (!isFrozen) {
             postCommand_App("font.changed");
@@ -2306,6 +2315,7 @@ iBool handleCommand_App(const char *cmd) {
             delta /= 2;
         }
         d->prefs.zoomPercent = iClamp(d->prefs.zoomPercent + delta, 50, 200);
+        invalidateCachedDocuments_App_();
         setDocumentFontSize_Text(text_Window(d->window), (float) d->prefs.zoomPercent / 100.0f);
         if (!isFrozen) {
             postCommand_App("font.changed");
diff --git a/src/gmdocument.c b/src/gmdocument.c
index a459b42f..0027bdb3 100644
--- a/src/gmdocument.c
+++ b/src/gmdocument.c
@@ -161,10 +161,9 @@ struct Impl_GmDocument {
     iInt2     size;
     int       outsideMargin;
     iBool     enableCommandLinks; /* `about:command?` only allowed on selected pages */
+    iBool     isLayoutInvalidated;
     iArray    layout; /* contents of source, laid out in document space */
     iPtrArray links;
-//    enum iGmDocumentBanner bannerType;
-//    iString   bannerText;
     iString   title; /* the first top-level title */
     iArray    headings;
     iArray    preMeta; /* metadata about preformatted blocks */
@@ -607,6 +606,7 @@ static void doLayout_GmDocument_(iGmDocument *d) {
 //    const iBool   isDarkBg          = isDark_GmDocumentTheme(
 //        isDark_ColorTheme(colorTheme_App()) ? prefs->docThemeDark : prefs->docThemeLight);
     initTheme_GmDocument_(d);
+    d->isLayoutInvalidated = iFalse;
     /* TODO: Collect these parameters into a GmTheme. */
     float indents[max_GmLineType] = { 5, 10, 5, isNarrow ? 5 : 10, 0, 0, 0, 5 };
     if (isExtremelyNarrow) {
@@ -1144,13 +1144,12 @@ void init_GmDocument(iGmDocument *d) {
     init_String(&d->source);
     init_String(&d->url);
     init_String(&d->localHost);
-//    d->bannerType = siteDomain_GmDocumentBanner;
     d->outsideMargin = 0;
     d->size = zero_I2();
     d->enableCommandLinks = iFalse;
+    d->isLayoutInvalidated = iFalse;
     init_Array(&d->layout, sizeof(iGmRun));
     init_PtrArray(&d->links);
-//    init_String(&d->bannerText);
     init_String(&d->title);
     init_Array(&d->headings, sizeof(iGmHeading));
     init_Array(&d->preMeta, sizeof(iGmPreMeta));
@@ -1166,7 +1165,6 @@ void init_GmDocument(iGmDocument *d) {
 void deinit_GmDocument(iGmDocument *d) {
     iReleasePtr(&d->openURLs);
     delete_Media(d->media);
-//    deinit_String(&d->bannerText);
     deinit_String(&d->title);
     clearLinks_GmDocument_(d);
     deinit_PtrArray(&d->links);
@@ -1722,22 +1720,28 @@ void setFormat_GmDocument(iGmDocument *d, enum iSourceFormat format) {
     d->format = format;
 }
 
-#if 0
-void setBanner_GmDocument(iGmDocument *d, enum iGmDocumentBanner type) {
-    d->bannerType = type;
+void setWidth_GmDocument(iGmDocument *d, int width, int canvasWidth) {
+    d->size.x        = width;
+    d->outsideMargin = iMax(0, (canvasWidth - width) / 2); /* distance to edge of the canvas */
+    doLayout_GmDocument_(d); /* TODO: just flag need-layout and do it later */
 }
-#endif
 
-void setWidth_GmDocument(iGmDocument *d, int width, int outsideMargin) {
-    d->size.x = width;
-    d->outsideMargin = outsideMargin; /* distance to edge of the viewport */
-    doLayout_GmDocument_(d); /* TODO: just flag need-layout and do it later */
+iBool updateWidth_GmDocument(iGmDocument *d, int width, int canvasWidth) {
+    if (d->size.x != width || d->isLayoutInvalidated) {
+        setWidth_GmDocument(d, width, canvasWidth);
+        return iTrue;
+    }
+    return iFalse;
 }
 
 void redoLayout_GmDocument(iGmDocument *d) {
     doLayout_GmDocument_(d);
 }
 
+void invalidateLayout_GmDocument(iGmDocument *d) {
+    d->isLayoutInvalidated = iTrue;
+}
+
 static void markLinkRunsVisited_GmDocument_(iGmDocument *d, const iIntSet *linkIds) {
     iForEach(Array, r, &d->layout) {
         iGmRun *run = r.value;
@@ -2082,7 +2086,7 @@ static void convertMarkdownToGemtext_GmDocument_(iGmDocument *d) {
     d->format = gemini_SourceFormat;
 }
 
-void setSource_GmDocument(iGmDocument *d, const iString *source, int width, int outsideMargin,
+void setSource_GmDocument(iGmDocument *d, const iString *source, int width, int canvasWidth,
                           enum iGmDocumentUpdate updateType) {
     /* TODO: This API has been set up to allow partial/progressive updating of the content.
        Currently the entire source is replaced every time, though. */
@@ -2124,7 +2128,7 @@ void setSource_GmDocument(iGmDocument *d, const iString *source, int width, int
     if (isNormalized_GmDocument_(d)) {
         normalize_GmDocument(d);
     }
-    setWidth_GmDocument(d, width, outsideMargin); /* re-do layout */
+    setWidth_GmDocument(d, width, canvasWidth); /* re-do layout */
 }
 
 void foldPre_GmDocument(iGmDocument *d, uint16_t preId) {
diff --git a/src/gmdocument.h b/src/gmdocument.h
index 444520c6..58fc3db3 100644
--- a/src/gmdocument.h
+++ b/src/gmdocument.h
@@ -120,10 +120,8 @@ enum iGmRunFlags {
     decoration_GmRunFlag  = iBit(1), /* not part of the source */
     startOfLine_GmRunFlag = iBit(2),
     endOfLine_GmRunFlag   = iBit(3),
-//    siteBanner_GmRunFlag  = iBit(4), /* area reserved for the site banner */
     quoteBorder_GmRunFlag = iBit(5),
     wide_GmRunFlag        = iBit(6), /* horizontally scrollable */
-//    footer_GmRunFlag      = iBit(7),
     altText_GmRunFlag     = iBit(8),
 };
 
@@ -177,13 +175,6 @@ enum iGmDocumentWarning {
     missingGlyphs_GmDocumentWarning = iBit(2),
 };
 
-/*
-enum iGmDocumentBanner {
-    none_GmDocumentBanner,
-    siteDomain_GmDocumentBanner,
-    certificateWarning_GmDocumentBanner,
-};*/
-
 enum iGmDocumentUpdate {
     partial_GmDocumentUpdate, /* appending more content */
     final_GmDocumentUpdate,   /* process all lines, including the last one if not terminated */
@@ -191,12 +182,13 @@ enum iGmDocumentUpdate {
 
 void    setThemeSeed_GmDocument (iGmDocument *, const iBlock *seed);
 void    setFormat_GmDocument    (iGmDocument *, enum iSourceFormat format);
-//void    setBanner_GmDocument    (iGmDocument *, enum iGmDocumentBanner type);
-void    setWidth_GmDocument     (iGmDocument *, int width, int outsideMargin);
+void    setWidth_GmDocument     (iGmDocument *, int width, int canvasWidth);
+iBool   updateWidth_GmDocument  (iGmDocument *, int width, int canvasWidth);
 void    redoLayout_GmDocument   (iGmDocument *);
+void    invalidateLayout_GmDocument(iGmDocument *); /* will have to be redone later */
 iBool   updateOpenURLs_GmDocument(iGmDocument *);
 void    setUrl_GmDocument       (iGmDocument *, const iString *url);
-void    setSource_GmDocument    (iGmDocument *, const iString *source, int width, int outsideMargin,
+void    setSource_GmDocument    (iGmDocument *, const iString *source, int width, int canvasWidth,
                                  enum iGmDocumentUpdate updateType);
 void    foldPre_GmDocument      (iGmDocument *, uint16_t preId);
 
@@ -204,8 +196,6 @@ void    updateVisitedLinks_GmDocument   (iGmDocument *); /* check all links for
 void    invalidatePalette_GmDocument    (iGmDocument *);
 void    makePaletteGlobal_GmDocument    (const iGmDocument *); /* copies document colors to the global palette */
 
-//void    reset_GmDocument        (iGmDocument *); /* free images */
-
 typedef void (*iGmDocumentRenderFunc)(void *, const iGmRun *);
 
 iMedia *        media_GmDocument            (iGmDocument *);
@@ -219,10 +209,6 @@ const iGmRun *  renderProgressive_GmDocument(const iGmDocument *d, const iGmRun
                                              iRangei visRangeY, iGmDocumentRenderFunc render,
                                              void *context);
 iInt2           size_GmDocument             (const iGmDocument *);
-//const iGmRun *  siteBanner_GmDocument       (const iGmDocument *);
-//iBool           hasSiteBanner_GmDocument    (const iGmDocument *);
-//enum iGmDocumentBanner bannerType_GmDocument(const iGmDocument *);
-//const iString * bannerText_GmDocument       (const iGmDocument *);
 const iArray *  headings_GmDocument         (const iGmDocument *); /* array of GmHeadings */
 const iString * source_GmDocument           (const iGmDocument *);
 size_t          memorySize_GmDocument       (const iGmDocument *); /* bytes */
diff --git a/src/history.c b/src/history.c
index 208c239d..7185912f 100644
--- a/src/history.c
+++ b/src/history.c
@@ -440,6 +440,17 @@ void clearCache_History(iHistory *d) {
     unlock_Mutex(d->mtx);
 }
 
+void invalidateCachedLayout_History(iHistory *d) {
+    lock_Mutex(d->mtx);
+    iForEach(Array, i, &d->recent) {
+        iRecentUrl *url = i.value;
+        if (url->cachedDoc) {
+            invalidateLayout_GmDocument(url->cachedDoc);
+        }
+    }
+    unlock_Mutex(d->mtx);
+}
+
 size_t pruneLeastImportant_History(iHistory *d) {
     size_t delta  = 0;
     size_t chosen = iInvalidPos;
diff --git a/src/history.h b/src/history.h
index 7dad72df..d3daae80 100644
--- a/src/history.h
+++ b/src/history.h
@@ -76,6 +76,7 @@ void        clearCache_History                  (iHistory *);
 size_t      pruneLeastImportant_History         (iHistory *);
 size_t      pruneLeastImportantMemory_History   (iHistory *);
 void        invalidateTheme_History             (iHistory *); /* theme has changed, cached contents need updating */
+void        invalidateCachedLayout_History      (iHistory *);
 
 iBool       atLatest_History            (const iHistory *);
 iBool       atOldest_History            (const iHistory *);
diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index 79bfea7b..8c24d4a9 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -1702,6 +1702,7 @@ static void updateDocument_DocumentWidget_(iDocumentWidget *d,
         }
         if (cachedDoc) {
             replaceDocument_DocumentWidget_(d, cachedDoc);
+            updateWidth_GmDocument(d->doc, documentWidth_DocumentWidget_(d), width_Widget(d));
         }
         else if (setSource) {
             setSource_DocumentWidget(d, &str);
@@ -2498,7 +2499,7 @@ static iBool updateDocumentWidthRetainingScrollPosition_DocumentWidget_(iDocumen
         /* TODO: First *fully* visible run? */
         voffset = visibleRange_DocumentWidget_(d).start - top_Rect(run->visBounds);
     }
-    setWidth_GmDocument(d->doc, newWidth, (width_Widget(d) - newWidth) / 2);
+    setWidth_GmDocument(d->doc, newWidth, width_Widget(d));
     setWidth_Banner(d->banner, newWidth);
     documentRunsInvalidated_DocumentWidget_(d);
     if (runLoc && !keepCenter) {
@@ -2734,6 +2735,9 @@ static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd)
     }
     else if (equal_Command(cmd, "window.resized") || equal_Command(cmd, "font.changed") ||
              equal_Command(cmd, "keyroot.changed")) {
+        if (equal_Command(cmd, "font.changed")) {
+            invalidateCachedLayout_History(d->mod.history);   
+        }
         /* Alt/Option key may be involved in window size changes. */
         setLinkNumberMode_DocumentWidget_(d, iFalse);
         d->phoneToolbar = findWidget_App("toolbar");