summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuel Mehrbrodt <samuel.mehrbrodt@allotropia.de>2022-08-11 11:53:35 +0200
committerSamuel Mehrbrodt <samuel.mehrbrodt@allotropia.de>2022-08-15 14:00:50 +0200
commit8750c812c9b808ee980f7e0ce0e6ce91e75e1424 (patch)
tree23bfbea753a4ef841e1e4aa911cdb9f728c52402
parentexternal/nss: Fix -Wincompatible-function-pointer-types (diff)
downloadcore-8750c812c9b808ee980f7e0ce0e6ce91e75e1424.tar.gz
core-8750c812c9b808ee980f7e0ce0e6ce91e75e1424.zip
Fix mispositioning when only quickstarter is active
When positioning a dialog via external UNO connection, and no LibreOffice window is visible (only quickstarter is running), the window was mispositioned. The ClientToScreen call changes the requested position, so skip that for dialogs too. Change-Id: I7656ec66b6aeccdc1fa306f5e05cf72b3cb87214 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138135 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt <samuel.mehrbrodt@allotropia.de>
-rw-r--r--vcl/win/window/salframe.cxx5
1 files changed, 3 insertions, 2 deletions
diff --git a/vcl/win/window/salframe.cxx b/vcl/win/window/salframe.cxx
index 598b5ea70fa8..6dad2785179c 100644
--- a/vcl/win/window/salframe.cxx
+++ b/vcl/win/window/salframe.cxx
@@ -1273,8 +1273,9 @@ void WinSalFrame::SetPosSize( tools::Long nX, tools::Long nY, tools::Long nWidth
if( AllSettings::GetLayoutRTL() )
nX = (aParentRect.right - aParentRect.left) - nWidth-1 - nX;
- //#110386#, do not transform coordinates for system child windows
- if( !(GetWindowStyle( mhWnd ) & WS_CHILD) )
+ //#110386#, do not transform coordinates for system child windows and dialogs
+ if( !(GetWindowStyle( mhWnd ) & WS_CHILD) &&
+ !(GetWindowStyle( mhWnd ) & WS_DLGFRAME) )
{
POINT aPt;
aPt.x = nX;