Skip to content

W
wine-cw
Commit d053539f authored by Jake Hamby's avatar Jake Hamby Committed by Alexandre Julliard
Browse files
Options

Several of the registry keys for system colors and system metrics were

incorrect.
parent 4a787831
Show whitespace changes
Inline Side-by-side
Showing with 16 additions and 16 deletions
windows/syscolor.c
View file @ d053539f
......@@ -53,7 +53,7 @@ static const char * const DefSysColors[] =
"TitleText", "255 255 255", /* COLOR_CAPTIONTEXT */
"ActiveBorder", "192 192 192", /* COLOR_ACTIVEBORDER */
"InactiveBorder", "192 192 192", /* COLOR_INACTIVEBORDER */
"AppWorkspace", "128 128 128", /* COLOR_APPWORKSPACE */
"AppWorkSpace", "128 128 128", /* COLOR_APPWORKSPACE */
"Hilight", "0 0 128", /* COLOR_HIGHLIGHT */
"HilightText", "255 255 255", /* COLOR_HIGHLIGHTTEXT */
"ButtonFace", "192 192 192", /* COLOR_BTNFACE */
......@@ -62,11 +62,11 @@ static const char * const DefSysColors[] =
"ButtonText", "0 0 0", /* COLOR_BTNTEXT */
"InactiveTitleText", "192 192 192",/* COLOR_INACTIVECAPTIONTEXT */
"ButtonHilight", "255 255 255", /* COLOR_BTNHIGHLIGHT */
"3DDarkShadow", "0 0 0", /* COLOR_3DDKSHADOW */
"3DLight", "224 224 224", /* COLOR_3DLIGHT */
"ButtonDkShadow", "0 0 0", /* COLOR_3DDKSHADOW */
"ButtonLight", "224 224 224", /* COLOR_3DLIGHT */
"InfoText", "0 0 0", /* COLOR_INFOTEXT */
"InfoBackground", "255 255 225", /* COLOR_INFOBK */
"AlternateButtonFace", "180 180 180", /* COLOR_ALTERNATEBTNFACE */
"InfoWindow", "255 255 225", /* COLOR_INFOBK */
"ButtonAlternateFace", "180 180 180", /* COLOR_ALTERNATEBTNFACE */
"HotTrackingColor", "0 0 255", /* COLOR_HOTLIGHT */
"GradientActiveTitle", "16 132 208", /* COLOR_GRADIENTACTIVECAPTION */
"GradientInactiveTitle", "181 181 181" /* COLOR_GRADIENTINACTIVECAPTION */
......
windows/sysmetrics.c
View file @ d053539f
......@@ -166,8 +166,8 @@ void SYSMETRICS_Init(void)
sysMetrics[SM_CXMIN] = 112;
sysMetrics[SM_CYMIN] = 27;
sysMetrics[SM_CXSIZE] = sysMetrics[SM_CYCAPTION] - 1;
sysMetrics[SM_CYSIZE] = sysMetrics[SM_CXSIZE];
sysMetrics[SM_CXSIZE] = SYSMETRICS_GetRegistryMetric (hkey, "CaptionWidth", sysMetrics[SM_CYCAPTION] - 1);
sysMetrics[SM_CYSIZE] = sysMetrics[SM_CYCAPTION] - 1;
sysMetrics[SM_CXMINTRACK] = sysMetrics[SM_CXMIN];
sysMetrics[SM_CYMINTRACK] = sysMetrics[SM_CYMIN];
......@@ -195,13 +195,13 @@ void SYSMETRICS_Init(void)
sysMetrics[SM_CYEDGE] = sysMetrics[SM_CXEDGE];
sysMetrics[SM_CXMINSPACING] = 160;
sysMetrics[SM_CYMINSPACING] = 24;
sysMetrics[SM_CXSMICON] = sysMetrics[SM_CYSIZE] - (sysMetrics[SM_CYSIZE] % 2);
sysMetrics[SM_CYSMICON] = sysMetrics[SM_CXSMICON];
sysMetrics[SM_CYSMCAPTION] = 16;
sysMetrics[SM_CXSMSIZE] = 13;
sysMetrics[SM_CYSMSIZE] = 15;
sysMetrics[SM_CXMENUSIZE] = sysMetrics[SM_CYMENU] - 1;
sysMetrics[SM_CYMENUSIZE] = sysMetrics[SM_CXMENUSIZE];
sysMetrics[SM_CXSMICON] = 16;
sysMetrics[SM_CYSMICON] = 16;
sysMetrics[SM_CYSMCAPTION] = SYSMETRICS_GetRegistryMetric(hkey, "SmCaptionHeight", 15) + 1;
sysMetrics[SM_CXSMSIZE] = SYSMETRICS_GetRegistryMetric(hkey, "SmCaptionWidth", 13);
sysMetrics[SM_CYSMSIZE] = sysMetrics[SM_CYSMCAPTION] - 1;
sysMetrics[SM_CXMENUSIZE] = SYSMETRICS_GetRegistryMetric(hkey, "MenuWidth", sysMetrics[SM_CYMENU] - 1);
sysMetrics[SM_CYMENUSIZE] = sysMetrics[SM_CYMENU] - 1;
/* FIXME: What do these mean? */
sysMetrics[SM_ARRANGE] = ARW_HIDE;
......@@ -214,8 +214,8 @@ void SYSMETRICS_Init(void)
/* For the following: 0 = ok, 1 = failsafe, 2 = failsafe + network */
sysMetrics[SM_CLEANBOOT] = 0;
sysMetrics[SM_CXDRAG] = 2;
sysMetrics[SM_CYDRAG] = 2;
sysMetrics[SM_CXDRAG] = 4;
sysMetrics[SM_CYDRAG] = 4;
sysMetrics[SM_CXMENUCHECK] = 13;
sysMetrics[SM_CYMENUCHECK] = 13;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment