[Libreoffice-commits] core.git: vcl/source
Caolán McNamara
caolanm at redhat.com
Fri Nov 17 14:03:31 UTC 2017
vcl/source/window/winproc.cxx | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit ff8722507473328e811cdcd6293f091afe6aa7d3
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Nov 17 13:08:44 2017 +0000
Resolves: tdf#112943 don't close popups on resize if size didn't change
Change-Id: If5331248f69098570c87da060595f5a85721c2d2
Reviewed-on: https://gerrit.libreoffice.org/44882
Tested-by: Xisco Faulí <xiscofauli at libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx
index 81cf9f67765f..bed6fcc45854 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.cxx
@@ -1574,7 +1574,8 @@ static void KillOwnPopups( vcl::Window const * pWindow )
void ImplHandleResize( vcl::Window* pWindow, long nNewWidth, long nNewHeight )
{
- if( pWindow->GetStyle() & (WB_MOVEABLE|WB_SIZEABLE) )
+ const bool bChanged = (nNewWidth != pWindow->GetOutputWidthPixel()) || (nNewHeight != pWindow->GetOutputHeightPixel());
+ if (bChanged && pWindow->GetStyle() & (WB_MOVEABLE|WB_SIZEABLE))
{
KillOwnPopups( pWindow );
if( pWindow->ImplGetWindow() != ImplGetSVData()->maHelpData.mpHelpWin )
@@ -1586,7 +1587,7 @@ void ImplHandleResize( vcl::Window* pWindow, long nNewWidth, long nNewHeight )
pWindow->ImplGetWindow()->ImplGetWindowImpl()->mbAllResize
)
{
- if ( (nNewWidth != pWindow->GetOutputWidthPixel()) || (nNewHeight != pWindow->GetOutputHeightPixel()) )
+ if (bChanged)
{
pWindow->mnOutWidth = nNewWidth;
pWindow->mnOutHeight = nNewHeight;
More information about the Libreoffice-commits
mailing list