From b6a96ef366f62f85534e8e30e3d18e5be1c75986 Mon Sep 17 00:00:00 2001 From: Pranam Lashkari Date: Mon, 22 Jun 2020 22:24:55 +0530 Subject: [PATCH] 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 Reviewed-by: Andras Timar 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 --- sc/source/ui/app/inputwin.cxx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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); -- 2.11.4.GIT