sc/source/ui/app/inputwin.cxx | 6 ++++--
sc/source/ui/inc/inputwin.hxx | 2 +-
2 files changed, 5 insertions(+), 3 deletions(-)
New commits:
commit 26c08a91e86027c3f37dbd462209e63a5b26b259
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Tue Jul 28 20:13:48 2020 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Wed Jul 29 10:21:08 2020 +0200
expand last ImageButton to underlying PushButton
Change-Id: I260a738b06831684840175ba9b126ce41bacedfb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99649
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index ea75795f1e10..c67c8963327e 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -860,7 +860,7 @@ void ScInputWindow::AutoSum( bool& bRangeFinder, bool&
bSubTotal, OpCode eCode )
ScInputBarGroup::ScInputBarGroup(vcl::Window* pParent, ScTabViewShell* pViewSh)
: ScTextWndBase(pParent, WinBits(WB_HIDE | WB_TABSTOP)),
maTextWndGroup(VclPtr<ScTextWndGroup>::Create(this, pViewSh)),
- maButton(VclPtr<ImageButton>::Create(this, WB_TABSTOP | WB_FLATBUTTON |
WB_SMALLSTYLE | WB_NOPOINTERFOCUS)),
+ maButton(VclPtr<PushButton>::Create(this, WB_TABSTOP | WB_FLATBUTTON |
WB_SMALLSTYLE | WB_NOPOINTERFOCUS | WB_CENTER | WB_VCENTER)),
mnVertOffset(0)
{
maTextWndGroup->Show();
diff --git a/sc/source/ui/inc/inputwin.hxx b/sc/source/ui/inc/inputwin.hxx
index 7fc620eb22c1..1fe62fedca21 100644
--- a/sc/source/ui/inc/inputwin.hxx
+++ b/sc/source/ui/inc/inputwin.hxx
@@ -251,7 +251,7 @@ private:
void TriggerToolboxLayout();
VclPtr<ScTextWndGroup> maTextWndGroup;
- VclPtr<ImageButton> maButton;
+ VclPtr<PushButton> maButton;
long mnVertOffset;
DECL_LINK(ClickHdl, Button*, void);
commit 22a30af8b08114cac3626a9990a600a8ebb090a3
Author: Pranam Lashkari <lpra...@collabora.com>
AuthorDate: Mon Jun 22 22:24:55 2020 +0530
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Wed Jul 29 10:20:59 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 <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Andras Timar <andras.ti...@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99639
Tested-by: Jenkins
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index 8322f0502dde..ea75795f1e10 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -919,7 +919,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);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
