diff options
| author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2017-12-18 17:42:00 +0900 |
|---|---|---|
| committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2017-12-19 22:16:18 +0100 |
| commit | 7b36595ae2b59a8c4c41d6aedfd634aed8390851 (patch) | |
| tree | 7c8a8aa4d4bdaa91b8b7249854893e6b6a4e2042 /include | |
| parent | 0f3e957d1a11f12d91eb510f3ef09825a63d2b27 (diff) | |
menu: pass paint size to ImplPaint and account for buttons
When a menu bar is painted it needs to take into account that
the buttons (close) is positioned at the right side of the paint
area. To do this we need to pass what the output size is when
painting (ImplPaint) on the common menu code, instead of assuming
the whole area can be used.
Reviewed-on: https://gerrit.libreoffice.org/46710
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
(cherry picked from commit e11234d8d8d8ff2744b77a128f845dbe8e6faa1e)
Change-Id: I2e9d6c686929fe1cd7e28368a8055c1e2df13c49
Reviewed-on: https://gerrit.libreoffice.org/46794
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Diffstat (limited to 'include')
| -rw-r--r-- | include/vcl/menu.hxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx index 8c1b94788791..992d7b849b98 100644 --- a/include/vcl/menu.hxx +++ b/include/vcl/menu.hxx @@ -176,7 +176,7 @@ protected: SAL_DLLPRIVATE sal_uInt16 ImplGetFirstVisible() const; SAL_DLLPRIVATE sal_uInt16 ImplGetPrevVisible( sal_uInt16 nPos ) const; SAL_DLLPRIVATE sal_uInt16 ImplGetNextVisible( sal_uInt16 nPos ) const; - SAL_DLLPRIVATE void ImplPaint(vcl::RenderContext& rRenderContext, + SAL_DLLPRIVATE void ImplPaint(vcl::RenderContext& rRenderContext, Size const & rSize, sal_uInt16 nBorder, long nOffY = 0, MenuItemData* pThisDataOnly = nullptr, bool bHighlighted = false, bool bLayout = false, bool bRollover = false ) const; SAL_DLLPRIVATE void ImplPaintMenuTitle(vcl::RenderContext&, const Rectangle& rRect) const; |