Mobile: Footer button fixes; missing strings

21 files changed, 16 insertions, 8 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 409ac2f8..dd8b2eca 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -26,7 +26,7 @@ set (COPYRIGHT_YEAR 2021)
 if (IOS)
     set (PROJECT_VERSION 1.7)
     set (IOS_BUNDLE_VERSION 23)
-    set (IOS_BUILD_DATE "2021-09-17")
+    set (IOS_BUILD_DATE "2021-10-23")
 endif ()
 
 # Default that depend on environment.
diff --git a/po/en.po b/po/en.po
index daa90212..a6f2ee5a 100644
--- a/po/en.po
+++ b/po/en.po
@@ -267,6 +267,9 @@ msgstr "Help"
 msgid "menu.releasenotes"
 msgstr "Release Notes"
 
+msgid "menu.website"
+msgstr "Project Website…"
+
 msgid "menu.quit"
 msgstr "Quit Lagrange"
 
diff --git a/res/lang/de.bin b/res/lang/de.bin
index 6ee5d613..260f2e5a 100644
--- a/res/lang/de.bin
+++ b/res/lang/de.bin
diff --git a/res/lang/en.bin b/res/lang/en.bin
index ec84c294..e5d67a62 100644
--- a/res/lang/en.bin
+++ b/res/lang/en.bin
diff --git a/res/lang/eo.bin b/res/lang/eo.bin
index d90d530d..5b84e2b8 100644
--- a/res/lang/eo.bin
+++ b/res/lang/eo.bin
diff --git a/res/lang/es.bin b/res/lang/es.bin
index c7789568..ef1aed2e 100644
--- a/res/lang/es.bin
+++ b/res/lang/es.bin
diff --git a/res/lang/es_MX.bin b/res/lang/es_MX.bin
index 104ac165..b5af72d1 100644
--- a/res/lang/es_MX.bin
+++ b/res/lang/es_MX.bin
diff --git a/res/lang/fi.bin b/res/lang/fi.bin
index ad15d58d..f4eddb4f 100644
--- a/res/lang/fi.bin
+++ b/res/lang/fi.bin
diff --git a/res/lang/fr.bin b/res/lang/fr.bin
index 7fd5ecc1..8156fe47 100644
--- a/res/lang/fr.bin
+++ b/res/lang/fr.bin
diff --git a/res/lang/gl.bin b/res/lang/gl.bin
index ede1891e..48ca1bd7 100644
--- a/res/lang/gl.bin
+++ b/res/lang/gl.bin
diff --git a/res/lang/ia.bin b/res/lang/ia.bin
index a1e7994e..1f749638 100644
--- a/res/lang/ia.bin
+++ b/res/lang/ia.bin
diff --git a/res/lang/ie.bin b/res/lang/ie.bin
index cd2ba268..45d8c737 100644
--- a/res/lang/ie.bin
+++ b/res/lang/ie.bin
diff --git a/res/lang/isv.bin b/res/lang/isv.bin
index 6b6884c5..912bf6e6 100644
--- a/res/lang/isv.bin
+++ b/res/lang/isv.bin
diff --git a/res/lang/pl.bin b/res/lang/pl.bin
index 2808106a..2bb0c45e 100644
--- a/res/lang/pl.bin
+++ b/res/lang/pl.bin
diff --git a/res/lang/ru.bin b/res/lang/ru.bin
index cf51f0c1..df0fea58 100644
--- a/res/lang/ru.bin
+++ b/res/lang/ru.bin
diff --git a/res/lang/sk.bin b/res/lang/sk.bin
index 18cf1190..0ad31c0b 100644
--- a/res/lang/sk.bin
+++ b/res/lang/sk.bin
diff --git a/res/lang/sr.bin b/res/lang/sr.bin
index d0d4eac5..7be9ab33 100644
--- a/res/lang/sr.bin
+++ b/res/lang/sr.bin
diff --git a/res/lang/tok.bin b/res/lang/tok.bin
index e69c6164..4a213691 100644
--- a/res/lang/tok.bin
+++ b/res/lang/tok.bin
diff --git a/res/lang/zh_Hans.bin b/res/lang/zh_Hans.bin
index 0c2a98ad..5abdc3ee 100644
--- a/res/lang/zh_Hans.bin
+++ b/res/lang/zh_Hans.bin
diff --git a/res/lang/zh_Hant.bin b/res/lang/zh_Hant.bin
index a776b3e7..2295148e 100644
--- a/res/lang/zh_Hant.bin
+++ b/res/lang/zh_Hant.bin
diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index a762cb01..aceae0fa 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -526,7 +526,8 @@ static iRect documentBounds_DocumentWidget_(const iDocumentWidget *d) {
         rect.size.y -= margin;
     }
     if (d->flags & centerVertically_DocumentWidgetFlag) {
-        const iInt2 docSize = size_GmDocument(d->doc);
+        const iInt2 docSize = addY_I2(size_GmDocument(d->doc),
+                                      iMax(height_Widget(d->footerButtons), height_Widget(d->phoneToolbar)));
         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. */
@@ -608,11 +609,13 @@ static int scrollMax_DocumentWidget_(const iDocumentWidget *d) {
     const iWidget *w = constAs_Widget(d);
     int sm = size_GmDocument(d->doc).y - height_Rect(bounds_Widget(w)) +
              (hasSiteBanner_GmDocument(d->doc) ? 1 : 2) * d->pageMargin * gap_UI +
-             height_Widget(d->footerButtons);
-    if (d->phoneToolbar) {
-        sm += size_Root(w->root).y -
-              top_Rect(boundsWithoutVisualOffset_Widget(d->phoneToolbar));
-    }
+             iMax(height_Widget(d->phoneToolbar), height_Widget(d->footerButtons));
+//    sm += height_Widget(d->phoneToolbar);
+//    if (d->phoneToolbar) {
+//        sm += size_Root(w->root).y -
+//              top_Rect(boundsWithoutVisualOffset_Widget(d->phoneToolbar));
+//        sm += height_Widget(d->phoneToolbar);
+//    }
     return sm;
 }
 
@@ -878,10 +881,12 @@ static void updateVisible_DocumentWidget_(iDocumentWidget *d) {
         else {
             d->footerButtons->animOffsetRef = &d->scrollY.pos;
             d->footerButtons->rect.pos.y = size_GmDocument(d->doc).y + 2 * gap_UI * d->pageMargin;
+//            + height_Widget(d->phoneToolbar);
         }
     }
     setRange_ScrollWidget(d->scroll, (iRangei){ 0, scrollMax });
-    const int docSize = size_GmDocument(d->doc).y;
+    const int docSize = size_GmDocument(d->doc).y + iMax(height_Widget(d->phoneToolbar),
+                                                         height_Widget(d->footerButtons));
     setThumb_ScrollWidget(d->scroll,
                           pos_SmoothScroll(&d->scrollY),
                           docSize > 0 ? height_Rect(bounds) * size_Range(&visRange) / docSize : 0);