sc/source/ui/app/inputwin.cxx | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
New commits: commit 16fb30a16d1a8470605487097c854671dee62830 Author: Jan Holesovsky <ke...@collabora.com> AuthorDate: Tue Feb 11 21:41:12 2020 +0100 Commit: Andras Timar <andras.ti...@collabora.com> CommitDate: Wed Feb 12 14:33:41 2020 +0100 android: Don't show the multiline toggle in the formula input bar on phones. The interaction there currently distorts the view and occupies too much space anyway. Change-Id: I093432dcfc223e4ea8b0f5a3cc45368f90c3cc0c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88477 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com> Reviewed-by: Jan Holesovsky <ke...@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88481 Tested-by: Jenkins Reviewed-by: Andras Timar <andras.ti...@collabora.com> diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx index 2017ca88959f..8117330bf114 100644 --- a/sc/source/ui/app/inputwin.cxx +++ b/sc/source/ui/app/inputwin.cxx @@ -32,6 +32,7 @@ #include <editeng/postitem.hxx> #include <editeng/langitem.hxx> #include <sfx2/bindings.hxx> +#include <sfx2/lokhelper.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/event.hxx> @@ -727,7 +728,9 @@ ScInputBarGroup::ScInputBarGroup(vcl::Window* pParent, ScTabViewShell* pViewSh) maButton->Enable(); maButton->SetSymbol(SymbolType::SPIN_DOWN); maButton->SetQuickHelpText(ScResId(SCSTR_QHELP_EXPAND_FORMULA)); - maButton->Show(); + // disable the multiline toggle on the mobile phones + if (!comphelper::LibreOfficeKit::isActive() || !comphelper::LibreOfficeKit::isMobile(SfxLokHelper::getView())) + maButton->Show(); } ScInputBarGroup::~ScInputBarGroup() @@ -777,7 +780,8 @@ void ScInputBarGroup::Resize() aSize.setHeight(maTextWndGroup->GetPixelHeightForLines(maTextWndGroup->GetNumLines())); SetSizePixel(aSize); - aSize.setWidth(aSize.Width() - maButton->GetSizePixel().Width() - BUTTON_OFFSET); + long nButtonWidth = maButton->IsVisible()? maButton->GetSizePixel().Width() + BUTTON_OFFSET: 0; + aSize.setWidth(aSize.Width() - nButtonWidth); maTextWndGroup->SetSizePixel(aSize); maTextWndGroup->Resize(); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits