[ros-diffs] [mbosma] 21966: Nicer caption bar effect. Colors by EmuandCo.

mbosma at svn.reactos.org mbosma at svn.reactos.org
Sun May 21 20:42:56 CEST 2006


Author: mbosma
Date: Sun May 21 22:42:56 2006
New Revision: 21966

URL: http://svn.reactos.ru/svn/reactos?rev=21966&view=rev
Log:
Nicer caption bar effect. Colors by EmuandCo.

Modified:
    branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/nonclient.c
    branches/ros-branch-0_3_0/reactos/subsystems/win32/win32k/objects/stockobj.c

Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/nonclient.c
URL: http://svn.reactos.ru/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/nonclient.c?rev=21966&r1=21965&r2=21966&view=diff
==============================================================================
--- branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/nonclient.c (original)
+++ branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/nonclient.c Sun May 21 22:42:56 2006
@@ -1149,8 +1149,8 @@
     {
         if (uFlags & DC_GRADIENT)
         {
-          static GRADIENT_RECT gcap = {0, 1};
-		  TRIVERTEX vert[2];
+          static GRADIENT_RECT gcap [] = {{0, 1}, {2, 3}};
+          TRIVERTEX vert[4];
           COLORREF Colors[2];
           LONG xx;
 
@@ -1178,19 +1178,33 @@
 
           vert[0].x = r.left;
           vert[0].y = 0;
-          vert[0].Red = GetRValue(Colors[0]) << 8;
-          vert[0].Green = GetGValue(Colors[0]) << 8;
-          vert[0].Blue = GetBValue(Colors[0]) << 8;
+          vert[0].Red = GetRValue(Colors[1]) << 8;
+          vert[0].Green = GetGValue(Colors[1]) << 8;
+          vert[0].Blue = GetBValue(Colors[1]) << 8;
           vert[0].Alpha = 0;
 
           vert[1].x = r.right;
-          vert[1].y = lprc->bottom - lprc->top;
-          vert[1].Red = GetRValue(Colors[1]) << 8;
-          vert[1].Green = GetGValue(Colors[1]) << 8;
-          vert[1].Blue = GetBValue(Colors[1]) << 8;
+          vert[1].y = (lprc->bottom - lprc->top) >> 1;
+          vert[1].Red = GetRValue(Colors[0]) << 8;
+          vert[1].Green = GetGValue(Colors[0]) << 8;
+          vert[1].Blue = GetBValue(Colors[0]) << 8;
           vert[1].Alpha = 0;
 
-          GdiGradientFill(MemDC, vert, 2, &gcap, 1, GRADIENT_FILL_RECT_V);
+          vert[2].x = r.left;
+          vert[2].y = (lprc->bottom - lprc->top) >> 1;
+          vert[2].Red = GetRValue(Colors[0]) << 8;
+          vert[2].Green = GetGValue(Colors[0]) << 8;
+          vert[2].Blue = GetBValue(Colors[0]) << 8;
+          vert[2].Alpha = 0;
+
+          vert[3].x = r.right;
+          vert[3].y = (lprc->bottom - lprc->top);
+          vert[3].Red = GetRValue(Colors[1]) << 8;
+          vert[3].Green = GetGValue(Colors[1]) << 8;
+          vert[3].Blue = GetBValue(Colors[1]) << 8;
+          vert[3].Alpha = 0;
+
+          GdiGradientFill(MemDC, vert, 4, &gcap, 2, GRADIENT_FILL_RECT_V);
 
           if ((uFlags & DC_ICON) && (Style & WS_SYSMENU) && !(uFlags & DC_SMALLCAP))
           {

Modified: branches/ros-branch-0_3_0/reactos/subsystems/win32/win32k/objects/stockobj.c
URL: http://svn.reactos.ru/svn/reactos/branches/ros-branch-0_3_0/reactos/subsystems/win32/win32k/objects/stockobj.c?rev=21966&r1=21965&r2=21966&view=diff
==============================================================================
--- branches/ros-branch-0_3_0/reactos/subsystems/win32/win32k/objects/stockobj.c (original)
+++ branches/ros-branch-0_3_0/reactos/subsystems/win32/win32k/objects/stockobj.c Sun May 21 22:42:56 2006
@@ -32,7 +32,7 @@
 {
   RGB(212, 208, 200), /* COLOR_SCROLLBAR  */
   RGB(58, 110, 165),  /* COLOR_BACKGROUND  */
-  RGB(10, 36, 106),   /* COLOR_ACTIVECAPTION  */
+  RGB(56, 112, 168),  /* COLOR_ACTIVECAPTION  */
   RGB(128, 128, 128), /* COLOR_INACTIVECAPTION  */
   RGB(212, 208, 200), /* COLOR_MENU  */
   RGB(255, 255, 255), /* COLOR_WINDOW  */
@@ -57,7 +57,7 @@
   RGB(255, 255, 225), /* COLOR_INFOBK  */
   RGB(181, 181, 181), /* COLOR_UNKNOWN  */
   RGB(0, 0, 128),     /* COLOR_HOTLIGHT  */
-  RGB(166, 202, 240), /* COLOR_GRADIENTACTIVECAPTION  */
+  RGB(133, 162, 192), /* COLOR_GRADIENTACTIVECAPTION  */
   RGB(192, 192, 192), /* COLOR_GRADIENTINACTIVECAPTION  */
   RGB(49, 106, 197),  /* COLOR_MENUHILIGHT  */
   RGB(236, 233, 216)  /* COLOR_MENUBAR  */




More information about the Ros-diffs mailing list