cool#4250 - dpiscale: propagate from the client to the view via new l…

…ok API. In order to get the zoom level correct during save, it is necessary to get the dpiscale from the browser to the client. Use a new LOK setViewOption API to do this. Tolerate old style clientzoom to avoid changes to unit tests. Signed-off-by: Michael Meeks <[email protected]> Change-Id: Ib32d4765fffefaf9b6b52f6a789834914ae58b6f
rparth07 · Nov 27, 2024 · ea6250e · ea6250e
1 parent dccca45
commit ea6250e
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 5 deletions.
diff --git a/browser/src/layer/tile/CanvasTileLayer.js b/browser/src/layer/tile/CanvasTileLayer.js
@@ -1030,9 +1030,11 @@ L.CanvasTileLayer = L.Layer.extend({
 			return;
 
 		var newClientZoom = 'tilepixelwidth=' + this._tileWidthPx + ' ' +
-			'tilepixelheight=' + this._tileHeightPx + ' ' +
-			'tiletwipwidth=' + this._tileWidthTwips + ' ' +
-			'tiletwipheight=' + this._tileHeightTwips;
+		    'tilepixelheight=' + this._tileHeightPx + ' ' +
+		    'tiletwipwidth=' + this._tileWidthTwips + ' ' +
+		    'tiletwipheight=' + this._tileHeightTwips + ' ' +
+		    'dpiscale=' + window.devicePixelRatio + ' ' +
+		    'zoom=' + this._map.getZoom()
 
 		if (this._clientZoom !== newClientZoom || forceUpdate) {
 			// the zoom level has changed

diff --git a/kit/ChildSession.cpp b/kit/ChildSession.cpp
@@ -1189,8 +1189,9 @@ bool ChildSession::getCommandValues(const StringVector& tokens)
 bool ChildSession::clientZoom(const StringVector& tokens)
 {
     int tilePixelWidth, tilePixelHeight, tileTwipWidth, tileTwipHeight;
+    std::string dpiScale, zoom;
 
-    if (tokens.size() != 5 ||
+    if (tokens.size() < 5 ||
         !getTokenInteger(tokens[1], "tilepixelwidth", tilePixelWidth) ||
         !getTokenInteger(tokens[2], "tilepixelheight", tilePixelHeight) ||
         !getTokenInteger(tokens[3], "tiletwipwidth", tileTwipWidth) ||
@@ -1203,6 +1204,15 @@ bool ChildSession::clientZoom(const StringVector& tokens)
     getLOKitDocument()->setView(_viewId);
 
     getLOKitDocument()->setClientZoom(tilePixelWidth, tilePixelHeight, tileTwipWidth, tileTwipHeight);
+
+    if (tokens.size() == 7 &&
+        getTokenString(tokens[5], "dpiscale", dpiScale) &&
+        getTokenString(tokens[6], "zoom", zoom))
+    {
+        getLOKitDocument()->setViewOption("dpiscale", dpiScale.c_str());
+        getLOKitDocument()->setViewOption("zoom", zoom.c_str());
+    }
+
     return true;
 }
 

diff --git a/wsd/ClientSession.cpp b/wsd/ClientSession.cpp
@@ -931,7 +931,7 @@ bool ClientSession::_handleInput(const char *buffer, int length)
     else if (tokens.equals(0, "clientzoom"))
     {
         int tilePixelWidth, tilePixelHeight, tileTwipWidth, tileTwipHeight;
-        if (tokens.size() != 5 ||
+        if (tokens.size() < 5 ||
             !getTokenInteger(tokens[1], "tilepixelwidth", tilePixelWidth) ||
             !getTokenInteger(tokens[2], "tilepixelheight", tilePixelHeight) ||
             !getTokenInteger(tokens[3], "tiletwipwidth", tileTwipWidth) ||