loleaflet/src/layer/tile/TileLayer.js | 2 +-
loleaflet/src/map/Map.js | 4 ++++
2 files changed, 5 insertions(+), 1 deletion(-)
New commits:
commit be4aad288f336f0b006f7a994cfe1fd88ced9581
Author: Marco Cecchetti <marco.cecche...@collabora.com>
AuthorDate: Fri Feb 7 18:19:08 2020 +0100
Commit: Marco Cecchetti <marco.cecche...@collabora.com>
CommitDate: Fri Feb 7 18:22:08 2020 +0100
loleaflet: calc: text selection: show handles only on the focused object
Change-Id: I468730f9700004428121debb4edfb0517b458c95
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/88232
Reviewed-by: Marco Cecchetti <marco.cecche...@collabora.com>
Tested-by: Marco Cecchetti <marco.cecche...@collabora.com>
diff --git a/loleaflet/src/layer/tile/TileLayer.js
b/loleaflet/src/layer/tile/TileLayer.js
index 7c111b603..998db324e 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -2998,7 +2998,7 @@ L.TileLayer = L.GridLayer.extend({
}
}
- if (this._selections.getLayers().length !== 0 ||
startMarker.isDragged || endMarker.isDragged) {
+ if (this._map.editorHasFocus() &&
(this._selections.getLayers().length !== 0 || startMarker.isDragged ||
endMarker.isDragged)) {
if (!startMarker || !endMarker ||
this._isEmptyRectangle(this._textSelectionStart) ||
this._isEmptyRectangle(this._textSelectionEnd)) {
diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js
index f06298aaa..26097523c 100644
--- a/loleaflet/src/map/Map.js
+++ b/loleaflet/src/map/Map.js
@@ -1365,6 +1365,10 @@ L.Map = L.Evented.extend({
// The editor got focus (probably a dialog closed or user clicked to
edit).
_onEditorGotFocus: function() {
this._changeFocusWidget(null, 0);
+ if (this.dialog._calcInputBar) {
+ var inputBarId = this.dialog._calcInputBar.id;
+ this.dialog._updateTextSelection(inputBarId);
+ }
},
// Our browser tab got focus.
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
