diff options
| author | Samuel Mehrbrodt <samuel.mehrbrodt@allotropia.de> | 2023-01-26 16:52:32 +0100 |
|---|---|---|
| committer | Samuel Mehrbrodt <samuel.mehrbrodt@allotropia.de> | 2023-01-27 05:42:19 +0000 |
| commit | f7544650cc4e31da67873898e2d587afa846b9b4 (patch) | |
| tree | 537fe95235888337ea25018bda9e8f92371099ed /sc | |
| parent | c9fb441c55d03f55877ed3bb2f5c39310d1ec44b (diff) | |
tdf#151682 Fix gap above input bar
Remove vertical offset, looks like it's not needed anymore.
Change-Id: If0f7f7dce7a7e4249036930b60fe353890b495fc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146179
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt <samuel.mehrbrodt@allotropia.de>
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/ui/app/inputwin.cxx | 9 | ||||
| -rw-r--r-- | sc/source/ui/inc/inputwin.hxx | 2 |
2 files changed, 1 insertions, 10 deletions
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx index c41899dc3166..7b9e208aec14 100644 --- a/sc/source/ui/app/inputwin.cxx +++ b/sc/source/ui/app/inputwin.cxx @@ -496,7 +496,7 @@ void ScInputWindow::Resize() if (pGroupBar->GetNumLines() > 1) { Size aGroupBarSize = pGroupBar->GetSizePixel(); - aSize.setHeight(aGroupBarSize.Height() + 2 * (pGroupBar->GetVertOffset() + 1)); + aSize.setHeight(aGroupBarSize.Height()); } } @@ -850,7 +850,6 @@ ScInputBarGroup::ScInputBarGroup(vcl::Window* pParent, ScTabViewShell* pViewSh) , mxTextWndGroup(new ScTextWndGroup(*this, pViewSh)) , mxButtonUp(m_xBuilder->weld_button("up")) , mxButtonDown(m_xBuilder->weld_button("down")) - , mnVertOffset(0) { InitControlBase(m_xContainer.get()); @@ -1086,12 +1085,6 @@ void ScInputBarGroup::TriggerToolboxLayout() ScInputWindow &rParent = dynamic_cast<ScInputWindow&>(*w); SfxViewFrame* pViewFrm = SfxViewFrame::Current(); - // Capture the vertical position of this window in the toolbar, when we increase - // the size of the toolbar to accommodate expanded line input we need to take this - // into account - if ( !mnVertOffset ) - mnVertOffset = rParent.GetItemPosRect( rParent.GetItemCount() - 1 ).Top(); - if ( !pViewFrm ) return; diff --git a/sc/source/ui/inc/inputwin.hxx b/sc/source/ui/inc/inputwin.hxx index 12bc461f2836..ac96062af137 100644 --- a/sc/source/ui/inc/inputwin.hxx +++ b/sc/source/ui/inc/inputwin.hxx @@ -262,7 +262,6 @@ public: void DecrementVerticalSize(); void NumLinesChanged(); virtual tools::Long GetNumLines() const override { return mxTextWndGroup->GetNumLines(); } - tools::Long GetVertOffset() const { return mnVertOffset; } int GetPixelHeightForLines() const { @@ -278,7 +277,6 @@ private: std::unique_ptr<ScTextWndGroup> mxTextWndGroup; std::unique_ptr<weld::Button> mxButtonUp; std::unique_ptr<weld::Button> mxButtonDown; - tools::Long mnVertOffset; DECL_LINK(ClickHdl, weld::Button&, void); }; |