diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-11-17 13:08:44 +0000 |
|---|---|---|
| committer | Adolfo Jayme Barrientos <fitojb@ubuntu.com> | 2017-11-17 15:34:10 +0100 |
| commit | a0527cf1105ca1e58d8ae510d7ff6ae870743771 (patch) | |
| tree | 8317bb55547963625bc625619bb2b697ff488c4b | |
| parent | 2a63ffd4d51d0e643d569a8d43b81bb691e45916 (diff) | |
Resolves: tdf#112943 don't close popups on resize if size didn't change
Change-Id: If5331248f69098570c87da060595f5a85721c2d2
Reviewed-on: https://gerrit.libreoffice.org/44883
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
| -rw-r--r-- | vcl/source/window/winproc.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx index b37395ad9bd0..7a612ac0a494 100644 --- a/vcl/source/window/winproc.cxx +++ b/vcl/source/window/winproc.cxx @@ -1599,7 +1599,8 @@ static void KillOwnPopups( vcl::Window* 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 ) @@ -1611,7 +1612,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; |