Changeset 2458 for trunk/src/user32/new/win32wbasenonclient.cpp

Timestamp:

Jan 16, 2000, 7:17:13 PM (26 years ago)

Author:

cbratschi

Message:

menu and frame changes

File:

• trunk/src/user32/new/win32wbasenonclient.cpp (modified) (9 diffs)

trunk/src/user32/new/win32wbasenonclient.cpp

@@ -1 @@
-/* $Id: win32wbasenonclient.cpp,v 1.12 2000-01-15 17:27:20 sandervl Exp $ */
+/* $Id: win32wbasenonclient.cpp,v 1.13 2000-01-16 18:17:13 cbratschi Exp $ */
 /*
  * Win32 Window Base Class for OS/2 (non-client methods)
@@ -317 +317 @@
 //******************************************************************************
 //******************************************************************************
-VOID Win32BaseWindow::AdjustRectOuter(LPRECT rect,BOOL menu)
-{
-  if(dwStyle & WS_ICONIC) return;
-
+VOID Win32BaseWindow::AdjustMaximizedRect(LPRECT rect)
+{
   /* Decide if the window will be managed (see CreateWindowEx) */
   //if (!WindowNeedsWMBorder()) //CB: check Options.managed
@@ -332 +330 @@
         if (HAS_THINFRAME( dwStyle ))
           InflateRect( rect, GetSystemMetrics(SM_CXBORDER), GetSystemMetrics(SM_CYBORDER));
+  }
+}
+//******************************************************************************
+//******************************************************************************
+VOID Win32BaseWindow::AdjustRectOuter(LPRECT rect,BOOL menu)
+{
+  if(dwStyle & WS_ICONIC) return;
+
+  /* Decide if the window will be managed (see CreateWindowEx) */
+  //if (!WindowNeedsWMBorder()) //CB: check Options.managed
+  {
+    if (HAS_THICKFRAME(dwStyle,dwExStyle ))
+      InflateRect( rect, GetSystemMetrics(SM_CXFRAME), GetSystemMetrics(SM_CYFRAME) );
+    else
+      if (HAS_DLGFRAME( dwStyle, dwExStyle ))
+        InflateRect(rect, GetSystemMetrics(SM_CXDLGFRAME), GetSystemMetrics(SM_CYDLGFRAME) );
+      else
+        if (HAS_THINFRAME( dwStyle ))
+          InflateRect( rect, GetSystemMetrics(SM_CXBORDER), GetSystemMetrics(SM_CYBORDER));
 
     if ((dwStyle & WS_CAPTION) == WS_CAPTION)
@@ -367 +384 @@
   LONG result = 0;
   UINT style;
+
+    dprintf(("Default WM_NCCALCSIZE handler"));
 
     if (!calcValidRects) return 0;
@@ -408 +427 @@
   RECT rect = rectWindow;
 
+  if (dwStyle & WS_MINIMIZE) return HTCAPTION;
+
   if (!PtInRect(&rect,pt)) return HTNOWHERE;
-
-  if (dwStyle & WS_MINIMIZE) return HTCAPTION;
 
   if (!(flags & WIN_MANAGED))
@@ -1197 +1216 @@
 LONG Win32BaseWindow::HandleNCRButtonUp(WPARAM wParam,LPARAM lParam)
 {
-  if (wParam == HTCAPTION)
-  {
-    if (GetActiveWindow() != Win32Hwnd)
+  switch(wParam)
+  {
+    case HTCAPTION:
+      if (GetActiveWindow() != Win32Hwnd)
         SetActiveWindow();
 
-    if ((GetActiveWindow() == Win32Hwnd) && (dwStyle & WS_SYSMENU))
-    {
-      SendInternalMessageA(WM_SYSCOMMAND,SC_MOUSEMENU+HTCAPTION,lParam);
-    }
+      if ((GetActiveWindow() == Win32Hwnd) && (dwStyle & WS_SYSMENU))
+      {
+        SendInternalMessageA(WM_SYSCOMMAND,SC_MOUSEMENU+HTCAPTION,lParam);
+      }
+      break;
+
+    default:
+      break;
   }
 
@@ -1225 +1249 @@
     case SC_SIZE:
     {
-      DWORD flags = 0;
+      DWORD flags;
+
+      if (dwStyle & WS_MAXIMIZE) break;
 
       switch ((wParam & 0xF)+2)
@@ -1260 +1286 @@
           flags = TFOS_BOTTOM | TFOS_RIGHT;
           break;
+
+        default:
+          flags = TFOS_BOTTOM | TFOS_RIGHT;
+          break;
       }
       if (flags) FrameTrackFrame(this,flags);
@@ -1266 +1296 @@
 
     case SC_MOVE:
+        if (dwStyle & WS_MAXIMIZE) break;
         FrameTrackFrame(this,TFOS_MOVE);
         break;