[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2-5' - loleaflet/css loleaflet/src

[Pranam Lashkari (via logerrit)]

 loleaflet/css/loleaflet.css                      |    2 +-
 loleaflet/src/control/Control.PresentationBar.js |    3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 3398cb6117305bd5062785b490f80e1065c5c933
Author:     Pranam Lashkari <lpranam at collabora.com>
AuthorDate: Thu Jul 2 17:59:11 2020 +0530
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Sun Jul 5 10:43:13 2020 +0200

    leaflet: removed slide controls from draw
    
    Change-Id: I5916d829b257729363125643cf3ba548f7e4e9db
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/97759
    Tested-by: Jenkins
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    (cherry picked from commit 99944f8842e73a4207c230f895ac02ecba23cfd0)
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/97798
    Tested-by: Andras Timar <andras.timar at collabora.com>

diff --git a/loleaflet/css/loleaflet.css b/loleaflet/css/loleaflet.css
index de1d246e1..03b13cd69 100644
--- a/loleaflet/css/loleaflet.css
+++ b/loleaflet/css/loleaflet.css
@@ -135,7 +135,7 @@ body {
 }
 
 #presentation-controls-wrapper.drawing {
-	bottom: 40px; /* Hide the presentation toolbar (insert slide etc.) for doctype = drawing */
+	bottom: 33px; /* Hide the presentation toolbar (insert slide etc.) for doctype = drawing */
 }
 
 #presentation-controls-wrapper.readonly {
diff --git a/loleaflet/src/control/Control.PresentationBar.js b/loleaflet/src/control/Control.PresentationBar.js
index eeb3cfac8..dd10369b0 100644
--- a/loleaflet/src/control/Control.PresentationBar.js
+++ b/loleaflet/src/control/Control.PresentationBar.js
@@ -10,6 +10,9 @@ L.Control.PresentationBar = L.Control.extend({
 	},
 
 	onAdd: function (map) {
+		if (this._map.getDocType() === 'drawing') {
+			return;
+		}
 		this.map = map;
 		this.create();