major overhaul of the -stickyWindows feature

[xboard.git] / winboard / wlayout.c

diff --git a/winboard/wlayout.c b/winboard/wlayout.c
index 0fd28f0..0261736 100644 (file)
--- a/winboard/wlayout.c
+++ b/winboard/wlayout.c
@@ -44,7 +44,7 @@ VOID RestoreWindowPlacement( HWND hWnd, WindowPlacement * wp )
 \r
         ZeroMemory( &stWP, sizeof(stWP) );\r
 \r
-       EnsureOnScreen( &wp->x, &wp->y);\r
+       EnsureOnScreen( &wp->x, &wp->y, 0, 0);\r
 \r
        stWP.length = sizeof(stWP);\r
        stWP.flags = 0;\r
@@ -156,3 +156,34 @@ VOID ReattachAfterMove( LPRECT lprcOldPos, int new_x, int new_y, HWND hWndChild,
         }\r
     }\r
 }\r
+\r
+extern FILE *debugFP;\r
+VOID ReattachAfterSize( LPRECT lprcOldPos, int new_w, int new_h, HWND hWndChild, WindowPlacement * pwpChild )\r
+{\r
+    if( ! IsDefaultPlacement( pwpChild ) ) {\r
+        GetActualPlacement( hWndChild, pwpChild );\r
+\r
+if(appData.debugMode) fprintf(debugFP, "resize, old=(%d,%d,%d,%d), new=(%d,%d)\n",\r
+lprcOldPos->left,lprcOldPos->top,lprcOldPos->right,lprcOldPos->bottom,new_w,new_h);\r
+        if( IsAttachedByWindowPlacement( lprcOldPos, pwpChild ) ) {\r
+            /* Get delta of lower right corner */\r
+            int delta_x = new_w - (lprcOldPos->right  - lprcOldPos->left);\r
+            int delta_y = new_h - (lprcOldPos->bottom - lprcOldPos->top);\r
+\r
+            /* Adjust size & placement */\r
+            if(pwpChild->x + pwpChild->width  >= lprcOldPos->right  )\r
+               pwpChild->width += delta_x;\r
+            if(pwpChild->y + pwpChild->height >= lprcOldPos->bottom )\r
+               pwpChild->height += delta_y;\r
+            if(pwpChild->x >= lprcOldPos->right)  pwpChild->width  -= delta_x, pwpChild->x += delta_x;\r
+            if(pwpChild->y >= lprcOldPos->bottom) pwpChild->height -= delta_y, pwpChild->y += delta_y;\r
+            /* Move window */\r
+            if( hWndChild != NULL ) {\r
+                SetWindowPos( hWndChild, HWND_TOP,\r
+                    pwpChild->x, pwpChild->y,\r
+                    pwpChild->width, pwpChild->height,\r
+                    SWP_NOZORDER );\r
+            }\r
+        }\r
+    }\r
+}\r