Changeset 2394 for trunk/src

Timestamp:

Jan 9, 2000, 8:46:27 PM (26 years ago)

Author:

sandervl

Message:

titlebar fix + gradient titlebar look

Location:

trunk/src/user32

Files:

• pmtitlebar.cpp (modified) (2 diffs)
• syscolor.cpp (modified) (2 diffs)
• syscolor.h (modified) (2 diffs)
• win32wbasepaint.cpp (modified) (2 diffs)

trunk/src/user32/pmtitlebar.cpp

@@ -1 @@
-/* $Id: pmtitlebar.cpp,v 1.3 2000-01-09 15:56:03 sandervl Exp $ */
+/* $Id: pmtitlebar.cpp,v 1.4 2000-01-09 19:46:25 sandervl Exp $ */
 /*
  * Win32 Titlebar Managment Code for OS/2
@@ -108 +108 @@
 
   default:
+        if(msg == TBM_SETHILITE || msg == WM_ERASEBACKGROUND)
+                goto RunDefWndProc;
         goto RunDefTitleBarProc;
   }

trunk/src/user32/syscolor.cpp

@@ -1 @@
-/* $Id: syscolor.cpp,v 1.12 1999-11-26 17:06:08 cbratschi Exp $ */
+/* $Id: syscolor.cpp,v 1.13 2000-01-09 19:46:26 sandervl Exp $ */
 
 /*
@@ -273 +273 @@
   return NUM_SYS_COLORS;
 }
+//******************************************************************************
+//******************************************************************************
+BOOL SYSCOLOR_GetUseWinColors(VOID)
+{
+  return USEWINCOLORS;
+}

trunk/src/user32/syscolor.h

@@ -1 @@
-/* $Id: syscolor.h,v 1.7 1999-11-26 17:06:08 cbratschi Exp $ */
+/* $Id: syscolor.h,v 1.8 2000-01-09 19:46:27 sandervl Exp $ */
 
 /*
@@ -20 +20 @@
 extern INT SYSCOLOR_GetLastColor(VOID);
 extern INT SYSCOLOR_GetNumColors(VOID);
+extern BOOL SYSCOLOR_GetUseWinColors(VOID);
 
 #endif  /* __WINE_SYSCOLOR_H */

trunk/src/user32/win32wbasepaint.cpp

@@ -1 @@
-/* $Id: win32wbasepaint.cpp,v 1.4 2000-01-09 17:57:50 sandervl Exp $ */
+/* $Id: win32wbasepaint.cpp,v 1.5 2000-01-09 19:46:27 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -710 +710 @@
   r.bottom--;
 
-  FillRect( hdc, &r, GetSysColorBrush(active ? COLOR_ACTIVECAPTION : COLOR_INACTIVECAPTION) );
+  //CB: todo:
+   //COLOR_GRADIENTACTIVECAPTION
+   //COLOR_GRADIENTINACTIVECAPTION
+   //-> end color
+
+  if (SYSCOLOR_GetUseWinColors())
+  {
+    COLORREF startColor = GetSysColor(active ? COLOR_ACTIVECAPTION:COLOR_INACTIVECAPTION),endColor = GetSysColor(active ? COLOR_GRADIENTACTIVECAPTION:COLOR_GRADIENTINACTIVECAPTION);
+
+    if (startColor == endColor)
+      FillRect(hdc,&r,GetSysColorBrush(startColor));
+    else
+    {
+      INT rDiff = GetRValue(endColor)-GetRValue(startColor);
+      INT gDiff = GetGValue(endColor)-GetGValue(startColor);
+      INT bDiff = GetBValue(endColor)-GetBValue(startColor);
+      INT steps = MAX(MAX(abs(rDiff),abs(gDiff)),abs(bDiff));
+      INT w = r.right-r.left;
+      RECT r2;
+
+      if (w < steps) steps = w;
+      r2.left = r2.right = r.left;
+      r2.top = r.top;
+      r2.bottom = r.bottom;
+      for (INT x = 0;x <= steps;x++)
+      {
+        COLORREF color = RGB(GetRValue(startColor)+rDiff*x/steps,GetGValue(startColor)+gDiff*x/steps,GetBValue(startColor)+bDiff*x/steps);
+        HBRUSH brush = CreateSolidBrush(color);
+
+        r2.left = r2.right;
+        r2.right = r.left+w*x/steps;
+        FillRect(hdc,&r2,brush);
+        DeleteObject(brush);
+      }
+    }
+  }
+  else FillRect(hdc,&r,GetSysColorBrush(active ? COLOR_ACTIVECAPTION:COLOR_INACTIVECAPTION));
 
   if (!hbitmapClose)