loleaflet/src/control/Ruler.js | 3 +++
loleaflet/src/map/handler/Map.Mouse.js | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
New commits:
commit 3d23119399b7e673f2c1d52b1ad1e9ad7e8eff77
Author: Aditya Dewan <aditya.de...@collabora.co.uk>
Date: Fri Dec 8 01:49:52 2017 +0530
no text selection when ruler interactions are happening
Change-Id: Id3628f407067506ddf6ce2e2dd2587bd2e35ddbc
Reviewed-on: https://gerrit.libreoffice.org/46040
Reviewed-by: pranavk <pran...@collabora.co.uk>
Tested-by: pranavk <pran...@collabora.co.uk>
diff --git a/loleaflet/src/control/Ruler.js b/loleaflet/src/control/Ruler.js
index 68ccbfd0..d13e3cbd 100644
--- a/loleaflet/src/control/Ruler.js
+++ b/loleaflet/src/control/Ruler.js
@@ -162,6 +162,7 @@ L.Control.Ruler = L.Control.extend({
},
_initiateDrag: function(e) {
+ this._map.rulerActive = true;
var dragableElem = e.srcElement || e.target;
L.DomEvent.on(this._rFace, 'mousemove', this._moveMargin, this);
@@ -200,6 +201,8 @@ L.Control.Ruler = L.Control.extend({
_endDrag: function(e) {
+ this._map.rulerActive = false;
+
var posChange = e.originalEvent.clientX - this._initialposition;
var unoObj = {}, marginType, fact;
diff --git a/loleaflet/src/map/handler/Map.Mouse.js
b/loleaflet/src/map/handler/Map.Mouse.js
index 78229005..f196adbe 100644
--- a/loleaflet/src/map/handler/Map.Mouse.js
+++ b/loleaflet/src/map/handler/Map.Mouse.js
@@ -38,7 +38,7 @@ L.Map.Mouse = L.Handler.extend({
_onMouseEvent: function (e) {
var docLayer = this._map._docLayer;
- if (!docLayer || (this._map.slideShow &&
this._map.slideShow.fullscreen)) {
+ if (!docLayer || (this._map.slideShow &&
this._map.slideShow.fullscreen) || this._map.rulerActive) {
return;
}
if (docLayer._graphicMarker) {
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
