vcl/win/window/salframe.cxx |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 16a77d089b3e6017f236e0dc61520df346ab2e85
Author:     Samuel Mehrbrodt <[email protected]>
AuthorDate: Thu Aug 11 11:53:35 2022 +0200
Commit:     Samuel Mehrbrodt <[email protected]>
CommitDate: Mon Aug 22 09:19:04 2022 +0200

    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 <[email protected]>
    (cherry picked from commit 8750c812c9b808ee980f7e0ce0e6ce91e75e1424)

diff --git a/vcl/win/window/salframe.cxx b/vcl/win/window/salframe.cxx
index dd5f8fbb8533..79e101057358 100644
--- a/vcl/win/window/salframe.cxx
+++ b/vcl/win/window/salframe.cxx
@@ -1288,8 +1288,9 @@ void WinSalFrame::SetPosSize( long nX, long nY, long 
nWidth, long nHeight,
             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;

Reply via email to