summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2020-01-15 17:52:08 +0200
committerTor Lillqvist <tml@collabora.com>2020-01-16 09:54:44 +0100
commitd229a0d873424d846e1753056e572af700906592 (patch)
treed17d30ffa6a781d0b12b94232eb4147cd527893e
parenta68a687f6eb1a26a2f04f092c5029a3d09be4052 (diff)
Check also graphic selection to see if a context menu should pop up on iOS
Change-Id: I475a9e14122ff8f0ca6ba3bc58ced945919e1087 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/86864 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Tor Lillqvist <tml@collabora.com>
-rw-r--r--loleaflet/src/map/handler/Map.TouchGesture.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/loleaflet/src/map/handler/Map.TouchGesture.js b/loleaflet/src/map/handler/Map.TouchGesture.js
index 84258c73e..b7ab8b4d8 100644
--- a/loleaflet/src/map/handler/Map.TouchGesture.js
+++ b/loleaflet/src/map/handler/Map.TouchGesture.js
@@ -206,7 +206,7 @@ L.Map.TouchGesture = L.Handler.extend({
if (window.ThisIsTheiOSApp) {
// console.log('==> ' + e.timeStamp);
- if (!this._toolbar._map && this._map._docLayer.containsSelection(latlng)) {
+ if (!this._toolbar._map && (docLayer.containsSelection(latlng) || (docLayer._graphicSelection && docLayer._graphicSelection.contains(latlng)))) {
this._toolbar._pos = containerPoint;
// console.log('==> Adding context toolbar ' + e.timeStamp);
this._toolbar.addTo(this._map);