[Libreoffice-commits] online.git: loleaflet/src

Tor Lillqvist (via logerrit) logerrit at kemper.freedesktop.org
Thu Jan 16 08:55:06 UTC 2020


 loleaflet/src/map/handler/Map.TouchGesture.js |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d229a0d873424d846e1753056e572af700906592
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Wed Jan 15 17:52:08 2020 +0200
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Thu Jan 16 09:54:44 2020 +0100

    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 at gmail.com>
    Reviewed-by: Tor Lillqvist <tml at collabora.com>

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);


More information about the Libreoffice-commits mailing list