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

[Pranam Lashkari (via logerrit)]

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

New commits:
commit da72f2b4cebbd40a4bae5fa4124dc86fc5042e66
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: Tue Jul 28 09:39:54 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>

diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index a8ecde9b214b..7842c92a1869 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -937,7 +937,9 @@ void ScInputBarGroup::Resize()
     long nLeft  = GetPosPixel().X();
 
     Size aSize  = GetSizePixel();
-    aSize.setWidth( std::max(long(nWidth - nLeft - LEFT_OFFSET), long(0)) );
+    //(-10) to allow margin between sidebar and formulabar
+    long margin = (comphelper::LibreOfficeKit::isActive()) ? 10 : 0;
+    aSize.setWidth( std::max(long(nWidth - nLeft - LEFT_OFFSET), long(0)) - margin);
 
     maScrollbar->SetPosPixel(Point( aSize.Width() - maButton->GetSizePixel().Width(), maButton->GetSizePixel().Height() ) );