[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - sc/source

[Pranam Lashkari (via logerrit)]

 sc/source/ui/app/inputwin.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit b6a96ef366f62f85534e8e30e3d18e5be1c75986
Author:     Pranam Lashkari <lpranam at collabora.com>
AuthorDate: Mon Jun 22 22:24:55 2020 +0530
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Fri Jul 31 10:52:19 2020 +0200

    LOK: added margin between sidebar and formula-bar
    
    Margin code moved from online to core
    Adding offset in online caused row/column header getting out of sync
    
    Change-Id: Ie977e0f6c6180b2bc20c94b88fd1d56144ed5faa
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96893
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99639
    Tested-by: Jenkins
    (cherry picked from commit 22a30af8b08114cac3626a9990a600a8ebb090a3)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99605
    Reviewed-by: Pranam Lashkari <lpranam at collabora.com>

diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index d8a5c32c0660..4d0a0f8d68a0 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -881,7 +881,9 @@ void ScInputBarGroup::Resize()
         return;
     }
     Size aSize = GetSizePixel();
-    aSize.setWidth(pParent->GetSizePixel().Width() - GetPosPixel().X() - LEFT_OFFSET);
+    //(-10) to allow margin between sidebar and formulabar
+    long margin = (comphelper::LibreOfficeKit::isActive()) ? 10 : 0;
+    aSize.setWidth(pParent->GetSizePixel().Width() - GetPosPixel().X() - LEFT_OFFSET - margin);
     aSize.setHeight(maTextWndGroup->GetPixelHeightForLines(maTextWndGroup->GetNumLines()));
     SetSizePixel(aSize);