diff options
| author | Maxim Monastirsky <momonasmon@gmail.com> | 2016-10-10 23:36:22 +0300 |
|---|---|---|
| committer | Maxim Monastirsky <momonasmon@gmail.com> | 2016-10-11 00:07:12 +0300 |
| commit | 9079d599baf01cb414ed4cccb22546f1807e5637 (patch) | |
| tree | 62e96b76ed74044c5c26253e44870fedc1658358 /vcl | |
| parent | e48d1086d79c319b31d48b984840a424780deefa (diff) | |
Merge SystemWindow and FloatingWindow setPosSizeOnContainee methods
This reverts commit 95942b16f44bc6eac57ad7b579b4158565446884
("Resolves: tdf#90481 fix cropped buttons"), and changes the
code in a way that seems to not crop buttons anymore. Tested
under gtk3 with File > Digital Signatures... and the toolbar
underline dropdown.
Change-Id: Idcb680c82f594f630b1dd7c76c42912e6b5a093a
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/window/floatwin.cxx | 11 | ||||
| -rw-r--r-- | vcl/source/window/syswin.cxx | 2 |
2 files changed, 1 insertions, 12 deletions
diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx index f9c4513d32a8..465177eb3499 100644 --- a/vcl/source/window/floatwin.cxx +++ b/vcl/source/window/floatwin.cxx @@ -827,15 +827,4 @@ void FloatingWindow::AddPopupModeWindow( vcl::Window* pWindow ) mpFirstPopupModeWin = pWindow; } -void FloatingWindow::setPosSizeOnContainee(Size aSize, Window &rBox) -{ - sal_Int32 nBorderWidth = get_border_width(); - - aSize.Width() -= mpWindowImpl->mnLeftBorder + mpWindowImpl->mnRightBorder + 2 * nBorderWidth; - aSize.Height() -= nBorderWidth + mpWindowImpl->mnTopBorder + mpWindowImpl->mnBottomBorder + 2 * nBorderWidth; - - Point aPos(nBorderWidth, nBorderWidth); - VclContainer::setLayoutAllocation(rBox, aPos, aSize); -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/window/syswin.cxx b/vcl/source/window/syswin.cxx index dca00fd98f27..f844eef16d1a 100644 --- a/vcl/source/window/syswin.cxx +++ b/vcl/source/window/syswin.cxx @@ -1107,7 +1107,7 @@ void SystemWindow::setPosSizeOnContainee(Size aSize, Window &rBox) aSize.Height() -= 2 * nBorderWidth; Point aPos(nBorderWidth, nBorderWidth); - VclContainer::setLayoutAllocation(rBox, aPos, aSize); + VclContainer::setLayoutAllocation(rBox, aPos, CalcOutputSize(aSize)); } IMPL_LINK_NOARG( SystemWindow, ImplHandleLayoutTimerHdl, Idle*, void ) |