[Libreoffice-commits] online.git: Branch 'libreoffice-6-4' - kit/ChildSession.cpp

[Michael Meeks (via logerrit)]

 kit/ChildSession.cpp |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit aeec4a2e7ce71679a001bc05769fb7f5b2e22125
Author:     Michael Meeks <michael.meeks at collabora.com>
AuthorDate: Sat Nov 30 17:15:45 2019 +0000
Commit:     Michael Meeks <michael.meeks at collabora.com>
CommitDate: Mon Dec 2 17:23:06 2019 +0100

    lok: add viewId to window painting, to allow special-casing on render.
    
    View switching should not cause the sidebar UX to re-build at all. So
    pass the view-id into the render call so we can avoid this.
    
    Change-Id: I194c1841df2cedfcdf82defb2712d20715d7ff1d
    Reviewed-on: https://gerrit.libreoffice.org/84131
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
    Tested-by: Michael Meeks <michael.meeks at collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/84225

diff --git a/kit/ChildSession.cpp b/kit/ChildSession.cpp
index 98101b6b1..2d71ad691 100644
--- a/kit/ChildSession.cpp
+++ b/kit/ChildSession.cpp
@@ -1464,8 +1464,6 @@ bool ChildSession::renderWindow(const char* /*buffer*/, int /*length*/, const st
 {
     const unsigned winId = (tokens.size() > 1 ? std::stoul(tokens[1]) : 0);
 
-    getLOKitDocument()->setView(_viewId);
-
     int startX = 0, startY = 0;
     int bufferWidth = 800, bufferHeight = 600;
     double dpiScale = 1.0;
@@ -1494,7 +1492,7 @@ bool ChildSession::renderWindow(const char* /*buffer*/, int /*length*/, const st
     int width = bufferWidth, height = bufferHeight;
     std::string response;
     const auto start = std::chrono::system_clock::now();
-    getLOKitDocument()->paintWindow(winId, pixmap.data(), startX, startY, width, height, dpiScale);
+    getLOKitDocument()->paintWindow(winId, pixmap.data(), startX, startY, width, height, dpiScale, _viewId);
     const double area = width * height;
 
     const auto duration = std::chrono::system_clock::now() - start;