Alexander Nicolaysen Sørnes : user32: Change to modern Windows colours.

Alexandre Julliard julliard at winehq.org
Tue Nov 20 10:55:03 CST 2007


Module: wine
Branch: master
Commit: 1f8ba9612880582b8db827cae4b6f2c4504c602e
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=1f8ba9612880582b8db827cae4b6f2c4504c602e

Author: Alexander Nicolaysen Sørnes <alex at thehandofagony.com>
Date:   Tue Nov 20 14:55:22 2007 +0100

user32: Change to modern Windows colours.

---

 dlls/user32/resources/display.rc |   10 +++++-----
 dlls/user32/sysparams.c          |   14 +++++++-------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/dlls/user32/resources/display.rc b/dlls/user32/resources/display.rc
index 647bf00..243bf2d 100644
--- a/dlls/user32/resources/display.rc
+++ b/dlls/user32/resources/display.rc
@@ -31,8 +31,8 @@
 	0x01,			/* horizontal-line width              */
 
 	/* default system color values */
-	0x00c0c0c0L,	/* scrollbar */
-	0x00c0c0c0L,	/* desktop */
+	0x00d4d0c8L,	/* scrollbar */
+	0x00d4d0c8L,	/* desktop */
 	0x00800000L,	/* active caption */
 	0x00ffffffL,	/* inactive caption */
 	0x00ffffffL,	/* menu */
@@ -41,12 +41,12 @@
 	0x00000000L,	/* menu text */
 	0x00000000L,	/* window text */
 	0x00ffffffL,	/* caption text */
-	0x00c0c0c0L,	/* active border */
-	0x00c0c0c0L,	/* inactive border */
+	0x00d4d0c8L,	/* active border */
+	0x00d4d0c8L,	/* inactive border */
 	0x00ffffffL,	/* app workspace */
 	0x00800000L,	/* hilite bk */
 	0x00ffffffL,	/* hilite text */
-	0x00c0c0c0L,	/* btn face */
+	0x00d4d0c8L,	/* btn face */
 	0x00808080L,	/* btn shadow */
 	0x00c0c0c0L,	/* gray text */
 	0x00000000L,	/* btn text */
diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c
index f5be96c..3c314f9 100644
--- a/dlls/user32/sysparams.c
+++ b/dlls/user32/sysparams.c
@@ -87,26 +87,26 @@ enum spi_index
 
 static const char * const DefSysColors[] =
 {
-    "Scrollbar", "192 192 192",              /* COLOR_SCROLLBAR */
+    "Scrollbar", "212 208 200",              /* COLOR_SCROLLBAR */
     "Background", "0 128 128",               /* COLOR_BACKGROUND */
     "ActiveTitle", "0 0 128",                /* COLOR_ACTIVECAPTION */
     "InactiveTitle", "128 128 128",          /* COLOR_INACTIVECAPTION */
-    "Menu", "192 192 192",                   /* COLOR_MENU */
+    "Menu", "212 208 200",                   /* COLOR_MENU */
     "Window", "255 255 255",                 /* COLOR_WINDOW */
     "WindowFrame", "0 0 0",                  /* COLOR_WINDOWFRAME */
     "MenuText", "0 0 0",                     /* COLOR_MENUTEXT */
     "WindowText", "0 0 0",                   /* COLOR_WINDOWTEXT */
     "TitleText", "255 255 255",              /* COLOR_CAPTIONTEXT */
-    "ActiveBorder", "192 192 192",           /* COLOR_ACTIVEBORDER */
-    "InactiveBorder", "192 192 192",         /* COLOR_INACTIVEBORDER */
+    "ActiveBorder", "212 208 200",           /* COLOR_ACTIVEBORDER */
+    "InactiveBorder", "212 208 200",         /* COLOR_INACTIVEBORDER */
     "AppWorkSpace", "128 128 128",           /* COLOR_APPWORKSPACE */
     "Hilight", "0 0 128",                    /* COLOR_HIGHLIGHT */
     "HilightText", "255 255 255",            /* COLOR_HIGHLIGHTTEXT */
-    "ButtonFace", "192 192 192",             /* COLOR_BTNFACE */
+    "ButtonFace", "212 208 200",             /* COLOR_BTNFACE */
     "ButtonShadow", "128 128 128",           /* COLOR_BTNSHADOW */
     "GrayText", "128 128 128",               /* COLOR_GRAYTEXT */
     "ButtonText", "0 0 0",                   /* COLOR_BTNTEXT */
-    "InactiveTitleText", "192 192 192",      /* COLOR_INACTIVECAPTIONTEXT */
+    "InactiveTitleText", "212 208 200",      /* COLOR_INACTIVECAPTIONTEXT */
     "ButtonHilight", "255 255 255",          /* COLOR_BTNHIGHLIGHT */
     "ButtonDkShadow", "0 0 0",               /* COLOR_3DDKSHADOW */
     "ButtonLight", "224 224 224",            /* COLOR_3DLIGHT */
@@ -117,7 +117,7 @@ static const char * const DefSysColors[] =
     "GradientActiveTitle", "16 132 208",     /* COLOR_GRADIENTACTIVECAPTION */
     "GradientInactiveTitle", "181 181 181",  /* COLOR_GRADIENTINACTIVECAPTION */
     "MenuHilight", "0 0 0",                  /* COLOR_MENUHILIGHT */
-    "MenuBar", "192 192 192"                 /* COLOR_MENUBAR */
+    "MenuBar", "212 208 200"                 /* COLOR_MENUBAR */
 };
 
 /**




More information about the wine-cvs mailing list