DocumentWidget: Adjusted document borders

3 files changed, 15 insertions, 3 deletions

diff --git a/src/gmdocument.c b/src/gmdocument.c
index 9b7bd630..5f5e8ad0 100644
--- a/src/gmdocument.c
+++ b/src/gmdocument.c
@@ -857,6 +857,14 @@ iInt2 size_GmDocument(const iGmDocument *d) {
     return d->size;
 }
 
+iBool hasSiteBanner_GmDocument(const iGmDocument *d) {
+    if (isEmpty_Array(&d->layout)) {
+        return iFalse;
+    }
+    const iGmRun *first = constFront_Array(&d->layout);
+    return (first->flags & siteBanner_GmRunFlag) != 0;
+}
+
 iRangecc findText_GmDocument(const iGmDocument *d, const iString *text, const char *start) {
     const char * src      = constBegin_String(&d->source);
     const size_t startPos = (start ? start - src : 0);
diff --git a/src/gmdocument.h b/src/gmdocument.h
index 42639357..7a0f21ee 100644
--- a/src/gmdocument.h
+++ b/src/gmdocument.h
@@ -75,7 +75,7 @@ typedef void (*iGmDocumentRenderFunc)(void *, const iGmRun *);
 
 void    render_GmDocument       (const iGmDocument *, iRangei visRangeY, iGmDocumentRenderFunc render, void *);
 iInt2   size_GmDocument         (const iGmDocument *);
-iInt2   sizeWithoutBanner_GmDocument    (const iGmDocument *);
+iBool   hasSiteBanner_GmDocument(const iGmDocument *);
 
 iRangecc        findText_GmDocument         (const iGmDocument *, const iString *text, const char *start);
 iRangecc        findTextBefore_GmDocument   (const iGmDocument *, const iString *text, const char *before);
diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index 3455db64..6d9c3451 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -168,8 +168,12 @@ static iRect documentBounds_DocumentWidget_(const iDocumentWidget *d) {
     iRect       rect;
     rect.size.x = documentWidth_DocumentWidget_(d);
     rect.pos.x  = bounds.size.x / 2 - rect.size.x / 2;
-    rect.pos.y  = top_Rect(bounds) + margin;
-    rect.size.y = height_Rect(bounds) - 2 * margin;
+    rect.pos.y  = top_Rect(bounds);
+    rect.size.y = height_Rect(bounds) - margin;
+    if (!hasSiteBanner_GmDocument(d->doc)) {
+        rect.pos.y += margin;
+        rect.size.y -= margin;
+    }
     iInt2 docSize = addY_I2(size_GmDocument(d->doc), 0 /*-lineHeight_Text(banner_FontId) * 2*/);
     if (docSize.y < rect.size.y) {
         /* Center vertically if short. */