Changeset 7734 for trunk/src

Timestamp:

Jan 7, 2002, 12:18:11 PM (24 years ago)

Author:

sandervl

Message:

fixed restoring of minimized or maximized window

Location:

trunk/src/user32

Files:

• pmwindow.cpp (modified) (4 diffs)
• win32wbase.cpp (modified) (3 diffs)
• win32wbase.h (modified) (4 diffs)

trunk/src/user32/pmwindow.cpp

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.166 2001-12-26 19:05:34 achimha Exp $ */
+/* $Id: pmwindow.cpp,v 1.167 2002-01-07 11:18:10 sandervl Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -1037 +1037 @@
                  DWORD dwOldStyle = win32wnd->getOldStyle();
                  DWORD dwStyle    = win32wnd->getStyle();
-                 
+
+                 win32wnd->setOldStyle(dwStyle);
                  if((dwOldStyle & WS_MINIMIZE_W) && !(dwStyle & WS_MINIMIZE_W)) {
                      //SC_RESTORE -> SC_MINIMIZE
+                     dprintf(("%x -> SC_RESTORE -> SC_MINIMIZE", win32wnd->getWindowHandle()));
                      FrameReplaceMenuItem(WinWindowFromID(hwnd, FID_MINMAX), 0, SC_RESTORE, SC_MINIMIZE, hbmFrameMenu[0]);
+                     if(dwStyle & WS_MAXIMIZE_W) {
+                         //SC_MAXIMIZE -> SC_RESTORE
+                         dprintf(("%x -> SC_MAXIMIZE -> SC_RESTORE", win32wnd->getWindowHandle()));
+                         FrameReplaceMenuItem(WinWindowFromID(hwnd, FID_MINMAX), MIT_END, SC_MAXIMIZE, SC_RESTORE, hbmFrameMenu[2]);
+                     }
                  }
                  else
                  if((dwOldStyle & WS_MAXIMIZE_W) && !(dwStyle & WS_MAXIMIZE_W)) {
                      //SC_RESTORE -> SC_MAXIMIZE
+                     dprintf(("%x -> SC_RESTORE -> SC_MAXIMIZE", win32wnd->getWindowHandle()));
                      FrameReplaceMenuItem(WinWindowFromID(hwnd, FID_MINMAX), MIT_END, SC_RESTORE, SC_MAXIMIZE, hbmFrameMenu[1]);
                  }
@@ -1050 +1058 @@
                  if(!(dwOldStyle & WS_MINIMIZE_W) && (dwStyle & WS_MINIMIZE_W)) {
                      //SC_MINIMIZE -> SC_RESTORE
+                     dprintf(("%x -> SC_MINIMIZE -> SC_RESTORE", win32wnd->getWindowHandle()));
                      FrameReplaceMenuItem(WinWindowFromID(hwnd, FID_MINMAX), 0, SC_MINIMIZE, SC_RESTORE, hbmFrameMenu[2]);
                  }
@@ -1055 +1064 @@
                  if(!(dwOldStyle & WS_MAXIMIZE_W) && (dwStyle & WS_MAXIMIZE_W)) {
                      //SC_MAXIMIZE -> SC_RESTORE
+                     dprintf(("%x -> SC_MAXIMIZE -> SC_RESTORE", win32wnd->getWindowHandle()));
                      FrameReplaceMenuItem(WinWindowFromID(hwnd, FID_MINMAX), MIT_END, SC_MAXIMIZE, SC_RESTORE, hbmFrameMenu[2]);
                  }

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.308 2001-12-30 16:51:37 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.309 2002-01-07 11:18:10 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -2677 +2677 @@
         NotifyFrameChanged(&wpos, &oldClientRect);
     }
+    if(!(getStyle() & (WS_MAXIMIZE|WS_MINIMIZE))) {
+        //Restore position always changes when the window position is changed
+        dprintf(("Save new restore position (%d,%d)(%d,%d)", rectWindow.left, rectWindow.top, rectWindow.right, rectWindow.bottom));
+        windowpos.rcNormalPosition = rectWindow;
+    }
     return (rc);
 }
@@ -2798 +2803 @@
         /* SDK: ...valid only the next time... */
         if(wndpl->flags & WPF_RESTORETOMAXIMIZED)
-        setFlags(getFlags() | WIN_RESTORE_MAX);
+            setFlags(getFlags() | WIN_RESTORE_MAX);
    }
    return TRUE;

trunk/src/user32/win32wbase.h

@@ -1 @@
-/* $Id: win32wbase.h,v 1.135 2001-11-24 13:55:14 sandervl Exp $ */
+/* $Id: win32wbase.h,v 1.136 2002-01-07 11:18:11 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -166 +166 @@
          ULONG  MsgGetTextLength();
          void   MsgGetText(char *wndtext, ULONG textlength);
-         VOID   updateWindowStyle(DWORD oldExStyle,DWORD oldStyle);
 
 virtual  LONG   SetWindowLong(int index, ULONG value, BOOL fUnicode);
@@ -176 +175 @@
          DWORD  getOldStyle()                   { return dwOldStyle; };
          void   setStyle(DWORD newstyle)        { dwStyle = newstyle; };
+         void   setOldStyle(DWORD oldStyle)     { dwOldStyle = oldStyle; };
          DWORD  getExStyle()                    { return dwExStyle; };
          void   setExStyle(DWORD newexstyle)    { dwExStyle = newexstyle; };
@@ -448 +448 @@
         ULONG   nrUserWindowBytes;
 
-        RECT    rectWindow; //relative to parent
+        RECT    rectWindow;  //relative to parent
         RECT    rectClient;  //relative to frame
 WINDOWPLACEMENT windowpos;