diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-02-13 16:42:19 +0000 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-02-17 13:15:33 +0000 |
| commit | 2575d7cb9c514bee71520f795a9a2f148c1e02c3 (patch) | |
| tree | 1c088cf7d905b1edc9baf4b4e6a805211f98cd14 /include | |
| parent | 0e4b1d2127957459b79f41a96f1fa0061d399b3b (diff) | |
Resolves: tdf#86159 floating windows have complicated borders
take the border window dimensions into account on the
layout size, but not the layout position
(cherry picked from commit d1f38b47c29ef5e2db2cabeb657668637d97e13d)
Conflicts:
include/vcl/syswin.hxx
Change-Id: I9deb722933e325c92e93ae917fa8e34eaccfca2d
Reviewed-on: https://gerrit.libreoffice.org/14480
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'include')
| -rw-r--r-- | include/vcl/floatwin.hxx | 1 | ||||
| -rw-r--r-- | include/vcl/syswin.hxx | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/include/vcl/floatwin.hxx b/include/vcl/floatwin.hxx index 5ad30a7282e5..079690ef8d13 100644 --- a/include/vcl/floatwin.hxx +++ b/include/vcl/floatwin.hxx @@ -94,6 +94,7 @@ private: SAL_DLLPRIVATE void ImplCallPopupModeEnd(); DECL_DLLPRIVATE_LINK( ImplEndPopupModeHdl, void* ); + virtual void setPosSizeOnContainee(Size aSize, VclContainer &rBox); // Copy assignment is forbidden and not implemented. SAL_DLLPRIVATE FloatingWindow (const FloatingWindow &); diff --git a/include/vcl/syswin.hxx b/include/vcl/syswin.hxx index 1f98a6b1d713..f98ca8f649b9 100644 --- a/include/vcl/syswin.hxx +++ b/include/vcl/syswin.hxx @@ -164,7 +164,7 @@ public: private: SAL_DLLPRIVATE void Init(); SAL_DLLPRIVATE void ImplMoveToScreen( long& io_rX, long& io_rY, long i_nWidth, long i_nHeight, vcl::Window* i_pConfigureWin ); - SAL_DLLPRIVATE void setPosSizeOnContainee(Size aSize, VclContainer &rBox); + virtual void setPosSizeOnContainee(Size aSize, VclContainer &rBox); DECL_DLLPRIVATE_LINK( ImplHandleLayoutTimerHdl, void* ); protected: |