[Libreoffice-commits] core.git: 2 commits - android/source libreofficekit/source sw/source

[Miklos Vajna]

 dev/null                                 |binary
 libreofficekit/source/gtk/lokdocview.cxx |    6 +++---
 sw/source/core/view/viewsh.cxx           |    9 +++++++++
 sw/source/uibase/docvw/SidebarWin.cxx    |    5 +++--
 4 files changed, 15 insertions(+), 5 deletions(-)

New commits:
commit 30b511ae38e2870174db91d12f65a9c3320fc172
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Mon Nov 23 13:46:59 2015 +0100

    sw lok comments: fix vertical scrollbar with custom zoom
    
    With this, if a comment has enough content that it gets a vertical
    scrollbar, then tiled rendering output looks OK, even with non-100%
    zoom.
    
    Change-Id: I699aadc11b6c34fb0791e70705719fd61169d972

diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index bf919a9..c45fd29 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -1881,6 +1881,15 @@ void SwViewShell::PaintTile(VirtualDevice &rDevice, int contextWidth, int contex
     aMapMode.SetScaleY(scaleY);
     rDevice.SetMapMode(aMapMode);
 
+    // Update scaling of SwEditWin and its sub-widgets, needed for comments.
+    if (GetWin() && GetWin()->GetMapMode().GetScaleX() != scaleX)
+    {
+        double fScale = scaleX;
+        SwViewOption aOption(*GetViewOptions());
+        aOption.SetZoom(fScale * 100);
+        ApplyViewOptions(aOption);
+    }
+
     Rectangle aOutRect = Rectangle(Point(tilePosX, tilePosY),
                                    rDevice.PixelToLogic(Size(contextWidth, contextHeight)));
 
diff --git a/sw/source/uibase/docvw/SidebarWin.cxx b/sw/source/uibase/docvw/SidebarWin.cxx
index 394fcbe..0891a2a 100644
--- a/sw/source/uibase/docvw/SidebarWin.cxx
+++ b/sw/source/uibase/docvw/SidebarWin.cxx
@@ -283,8 +283,7 @@ void SwSidebarWin::PaintTile(vcl::RenderContext& rRenderContext, const Rectangle
             continue;
 
         rRenderContext.Push(PushFlags::MAPMODE);
-        const Fraction& rFraction(mrView.GetWrtShellPtr()->GetOut()->GetMapMode().GetScaleY());
-        Point aOffset(PixelToLogic(pChild->GetPosPixel() * rFraction.GetDenominator() / rFraction.GetNumerator()));
+        Point aOffset(PixelToLogic(pChild->GetPosPixel()));
         MapMode aMapMode(rRenderContext.GetMapMode());
         aMapMode.SetOrigin(aMapMode.GetOrigin() + aOffset);
         rRenderContext.SetMapMode(aMapMode);
@@ -298,6 +297,8 @@ void SwSidebarWin::PaintTile(vcl::RenderContext& rRenderContext, const Rectangle
             pChild->EnableMapMode();
             aMapMode = pChild->GetMapMode();
             aMapMode.SetMapUnit(rRenderContext.GetMapMode().GetMapUnit());
+            aMapMode.SetScaleX(rRenderContext.GetMapMode().GetScaleX());
+            aMapMode.SetScaleY(rRenderContext.GetMapMode().GetScaleY());
             pChild->SetMapMode(aMapMode);
         }
 
commit 7ce0889ec9a87198560fa39afbae282938e0a9d9
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Mon Nov 23 10:18:15 2015 +0100

    android: remove duplicated bitmaps
    
    Change-Id: I5e16aa9da0aabe4302ebdd30b080b6bad4767006

diff --git a/android/source/res/drawable/handle_end.png b/android/source/res/drawable/handle_end.png
deleted file mode 100644
index 32b77df..0000000
Binary files a/android/source/res/drawable/handle_end.png and /dev/null differ
diff --git a/android/source/res/drawable/handle_middle.png b/android/source/res/drawable/handle_middle.png
deleted file mode 100644
index 751eb89..0000000
Binary files a/android/source/res/drawable/handle_middle.png and /dev/null differ
diff --git a/android/source/res/drawable/handle_start.png b/android/source/res/drawable/handle_start.png
deleted file mode 100644
index cf12a0d..0000000
Binary files a/android/source/res/drawable/handle_start.png and /dev/null differ
diff --git a/libreofficekit/source/gtk/lokdocview.cxx b/libreofficekit/source/gtk/lokdocview.cxx
index 6e9fc19..eebf6bc 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -1081,7 +1081,7 @@ renderOverlay(LOKDocView* pDocView, cairo_t* pCairo)
     if (priv->m_bEdit && priv->m_bCursorVisible && !isEmptyRectangle(priv->m_aVisibleCursor) && priv->m_aTextSelectionRectangles.empty())
     {
         // Have a cursor, but no selection: we need the middle handle.
-        gchar* handleMiddlePath = g_strconcat (priv->m_aLOPath, "/../..", CURSOR_HANDLE_DIR, "handle_middle.png", NULL);
+        gchar* handleMiddlePath = g_strconcat (priv->m_aLOPath, "/../..", CURSOR_HANDLE_DIR, "handle_image_middle.png", NULL);
         if (!priv->m_pHandleMiddle)
         {
             priv->m_pHandleMiddle = cairo_image_surface_create_from_png(handleMiddlePath);
@@ -1109,7 +1109,7 @@ renderOverlay(LOKDocView* pDocView, cairo_t* pCairo)
         if (!isEmptyRectangle(priv->m_aTextSelectionStart))
         {
             // Have a start position: we need a start handle.
-            gchar* handleStartPath = g_strconcat (priv->m_aLOPath, "/../..", CURSOR_HANDLE_DIR, "handle_start.png", NULL);
+            gchar* handleStartPath = g_strconcat (priv->m_aLOPath, "/../..", CURSOR_HANDLE_DIR, "handle_image_start.png", NULL);
             if (!priv->m_pHandleStart)
             {
                 priv->m_pHandleStart = cairo_image_surface_create_from_png(handleStartPath);
@@ -1121,7 +1121,7 @@ renderOverlay(LOKDocView* pDocView, cairo_t* pCairo)
         if (!isEmptyRectangle(priv->m_aTextSelectionEnd))
         {
             // Have a start position: we need an end handle.
-            gchar* handleEndPath = g_strconcat (priv->m_aLOPath, "/../..", CURSOR_HANDLE_DIR, "handle_end.png", NULL);
+            gchar* handleEndPath = g_strconcat (priv->m_aLOPath, "/../..", CURSOR_HANDLE_DIR, "handle_image_end.png", NULL);
             if (!priv->m_pHandleEnd)
             {
                 priv->m_pHandleEnd = cairo_image_surface_create_from_png(handleEndPath);