[Libreoffice-commits] online.git: Branch 'feature/calc-canvas' - 2 commits - loleaflet/css loleaflet/src

[Szymon KÅ‚os (via logerrit)]

 loleaflet/css/leaflet.css                  |    1 -
 loleaflet/css/loleaflet.css                |    5 ++++-
 loleaflet/css/menubar.css                  |    2 ++
 loleaflet/css/notebookbar.css              |    1 +
 loleaflet/css/spreadsheet.css              |    1 +
 loleaflet/css/toolbar.css                  |    3 ++-
 loleaflet/src/layer/vector/SplitterLine.js |   11 ++++++++++-
 7 files changed, 20 insertions(+), 4 deletions(-)

New commits:
commit 6672b5412cb4da044bc5df845d10bc05cddf6d75
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Tue Sep 8 13:52:33 2020 +0200
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Tue Sep 8 13:52:33 2020 +0200

    Split lines only in the corner when set to 0
    
    Change-Id: I6192219cede2d0888ecd77236f72ff734d99d778

diff --git a/loleaflet/css/leaflet.css b/loleaflet/css/leaflet.css
index 67899f262..1083c5b74 100644
--- a/loleaflet/css/leaflet.css
+++ b/loleaflet/css/leaflet.css
@@ -16,7 +16,6 @@
 	top: 0;
 	}
 .leaflet-container {
-	overflow: hidden;
 	-ms-touch-action: none;
 	}
 .leaflet-tile,
diff --git a/loleaflet/src/layer/vector/SplitterLine.js b/loleaflet/src/layer/vector/SplitterLine.js
index 344b91625..547663fe7 100644
--- a/loleaflet/src/layer/vector/SplitterLine.js
+++ b/loleaflet/src/layer/vector/SplitterLine.js
@@ -2,7 +2,7 @@
 /*
  * L.SplitterLine is a draggable L.Rectangle to be used as control for split-panes.
  */
-
+/* global $ */
 L.SplitterLine = L.Rectangle.extend({
 
 	options: {
@@ -43,9 +43,15 @@ L.SplitterLine = L.Rectangle.extend({
 		var xmin = isHoriz ? splitPos.x - thickness/2 : -size.x;
 		var xmax = isHoriz ? splitPos.x + thickness/2 : size.x;
 
+		if (!this._dragStarted && splitPos.y == 0 && !isHoriz)
+			xmax = thickness/2;
+
 		var ymin = !isHoriz ? splitPos.y - thickness/2 : -size.y;
 		var ymax = !isHoriz ? splitPos.y + thickness/2 : size.y;
 
+		if (!this._dragStarted && splitPos.x == 0 && isHoriz)
+			ymax = thickness/2;
+
 		return new L.LatLngBounds(
 			map.unproject(new L.Point(xmin, ymin)),
 			map.unproject(new L.Point(xmax, ymax))
@@ -66,6 +72,7 @@ L.SplitterLine = L.Rectangle.extend({
 		}.bind(this));
 
 		this.addClass('leaflet-pane-splitter');
+		$('.leaflet-pane-splitter').parent().css('overflow', 'visible');
 	},
 
 	_onDragStart: function(evt) {
@@ -78,6 +85,8 @@ L.SplitterLine = L.Rectangle.extend({
 		this._dragStarted = true;
 		L.DomEvent.stop(evt);
 
+		this.setBounds(this._calculateLatLngBounds());
+
 		this._pathNodeCollection.forEachNode(function (nodeData) {
 			var node = nodeData.getNode();
 			L.DomEvent.on(node, 'mousemove', this._onDrag, this);
commit 7b5805f81e14d2f6beea72cfd7530a425a9436b4
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Tue Sep 8 13:22:52 2020 +0200
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Tue Sep 8 13:22:55 2020 +0200

    Update css for split panes
    
    Set z-index for all toolbars in calc to allow
    enabling overflow of 'map' container content
    (eg. split lines). This patch ensures that
    lines will not be drawn above other UI elements.
    
    Change-Id: I02511b86545bf3012a8a067236ad04b5dd7b1d02

diff --git a/loleaflet/css/loleaflet.css b/loleaflet/css/loleaflet.css
index a85f43a6b..6e4ad7459 100644
--- a/loleaflet/css/loleaflet.css
+++ b/loleaflet/css/loleaflet.css
@@ -199,11 +199,14 @@ body {
 }
 
 #toolbar-wrapper {
-	position: relative;
+	position: absolute;
 	table-layout: fixed;
 	border-collapse: collapse;
 	width: 100%;
 	border-top: none;
+	background-color: white;
+	top: 38px;
+	z-index: 11;
 }
 
 #toolbar-logo {
diff --git a/loleaflet/css/menubar.css b/loleaflet/css/menubar.css
index ad09ffa61..9b9f30f56 100644
--- a/loleaflet/css/menubar.css
+++ b/loleaflet/css/menubar.css
@@ -56,6 +56,8 @@
     background: #ffffff;
     margin: 3px;
     white-space: nowrap;
+    position: absolute;
+    z-index: 12;
 }
 
 .main-nav.hasnotebookbar{
diff --git a/loleaflet/css/notebookbar.css b/loleaflet/css/notebookbar.css
index 233742b6c..c84b0b109 100644
--- a/loleaflet/css/notebookbar.css
+++ b/loleaflet/css/notebookbar.css
@@ -181,6 +181,7 @@
 #toolbar-wrapper.hasnotebookbar {
 	position: fixed;
 	z-index: 11;
+	top: 32px;
 }
 
 .cell.notebookbar {
diff --git a/loleaflet/css/spreadsheet.css b/loleaflet/css/spreadsheet.css
index abf6cad98..e19052ea9 100644
--- a/loleaflet/css/spreadsheet.css
+++ b/loleaflet/css/spreadsheet.css
@@ -24,6 +24,7 @@
 	height: 39px;
 	overflow: hidden;
 	white-space: nowrap;
+	z-index: 11;
 
 	background-color: var(--gray-bg-color);
 	}
diff --git a/loleaflet/css/toolbar.css b/loleaflet/css/toolbar.css
index 986290d35..74272cb03 100644
--- a/loleaflet/css/toolbar.css
+++ b/loleaflet/css/toolbar.css
@@ -77,8 +77,9 @@ w2ui-toolbar {
 		left: 0;
 		text-align: center;
 		bottom: 35px;
-		padding: 0;
+		padding: 4px 0px 4px 0px;
 		position: absolute;
+		z-index: 11;
 }
 
 #formulabar {