[Libreoffice-commits] online.git: 2 commits - kit/Watermark.hpp loleaflet/css

[mert (via logerrit)]

 kit/Watermark.hpp         |    2 +-
 loleaflet/css/toolbar.css |    5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

New commits:
commit 247ef399155443ecd2eadf641873bd55f2b4abd9
Author:     mert <mert.tumer at collabora.com>
AuthorDate: Tue Nov 26 20:17:49 2019 +0300
Commit:     Michael Meeks <michael.meeks at collabora.com>
CommitDate: Wed Nov 27 05:34:39 2019 +0100

    fix Insert shape dropdown is too narrow on desktop
    
    Change-Id: Id128cd455e3efb34498511434a38c03efa93c602
    Reviewed-on: https://gerrit.libreoffice.org/83814
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
    Tested-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/loleaflet/css/toolbar.css b/loleaflet/css/toolbar.css
index 9167625bb..5997dd077 100644
--- a/loleaflet/css/toolbar.css
+++ b/loleaflet/css/toolbar.css
@@ -760,9 +760,8 @@ button.leaflet-control-search-next
 		background: rgba(255, 255, 255, 0.5);
 		position: relative;
 		padding: 2px;
-		display: block;
-		overflow: auto; /* child margins otherwise don't expand *this* element (parent) */
-		width: 100%;
+		display: inline-block;
+		width:  350px;
 		height: 100%;
 }
 
commit ba423563307b9e7943723042dcfa8ccf029e9faf
Author:     mert <mert.tumer at collabora.com>
AuthorDate: Mon Nov 25 07:55:21 2019 +0300
Commit:     Michael Meeks <michael.meeks at collabora.com>
CommitDate: Wed Nov 27 05:34:27 2019 +0100

    Fix minor comparison error
    
    This patch is a follow-up for overflowing
    watermarks patch
    
    Change-Id: I8613736dc4fea49a22ae29aba209c95b1ea93557
    Reviewed-on: https://gerrit.libreoffice.org/83635
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
    Tested-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/kit/Watermark.hpp b/kit/Watermark.hpp
index 47aea5878..5fc0e5c3c 100644
--- a/kit/Watermark.hpp
+++ b/kit/Watermark.hpp
@@ -71,7 +71,7 @@ private:
             {
                 unsigned char* t = to + 4 * (to_y * to_width + to_x);
 
-                if (t[3] != 255.0)
+                if (t[3] != 255)
                     continue;
 
                 double dst_r = t[0];