[Libreoffice-commits] online.git: loleaflet/js

Tor Lillqvist (via logerrit) logerrit at kemper.freedesktop.org
Tue Jan 7 10:29:11 UTC 2020


 loleaflet/js/w2ui-1.5.rc1.js |    7 +++++++
 1 file changed, 7 insertions(+)

New commits:
commit ce7ad16087701adf9803f2dfd3b2da0eb2718668
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Tue Jan 7 11:47:47 2020 +0200
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Tue Jan 7 11:28:52 2020 +0100

    tdf#129374: Make the overlay wider on iOS if it seems necessary
    
    Horrible hack, but works for the specific case described in the bug at
    least.
    
    Change-Id: I55150d84dc892ece69540fdc0d06bc277891c1fa
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/86328
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Tor Lillqvist <tml at collabora.com>

diff --git a/loleaflet/js/w2ui-1.5.rc1.js b/loleaflet/js/w2ui-1.5.rc1.js
index fb5572b75..8d6562a6e 100644
--- a/loleaflet/js/w2ui-1.5.rc1.js
+++ b/loleaflet/js/w2ui-1.5.rc1.js
@@ -2388,6 +2388,13 @@ w2utils.event = {
                     Y = (offset.top + w2utils.getSize(obj, 'height') + options.top + 7);
                     offsetTop = offset.top;
                 }
+
+                // tdf#129374 make the overlay wider so that it is more likely all we want to put in it will fit. Yes, this
+                // is just horrible heuristics. The sane thing would be if this w2ui code could itself make sure that the
+                // overlay thing grows in width if necessary as stuff is added to it so that they all show up.
+                if (window.ThisIsTheiOSApp && X > window.innerWidth - 300)
+		    X = window.innerWidth - 300;
+
                 div1.css({
                     left        :  X + 'px',
                     top         :  Y + 'px',


More information about the Libreoffice-commits mailing list