Changeset 10519 for trunk/src/user32/user32.cpp

Timestamp:

Mar 15, 2004, 5:10:33 PM (21 years ago)

Author:

sandervl

Message:

GetSystemMetrics: corrected SM_CXICONSPACING & SM_CYICONSPACING

File:

• trunk/src/user32/user32.cpp (modified) (4 diffs)

trunk/src/user32/user32.cpp

@@ -1 @@
-/* $Id: user32.cpp,v 1.131 2004-03-12 11:43:57 sandervl Exp $ */
+/* $Id: user32.cpp,v 1.132 2004-03-15 16:10:33 sandervl Exp $ */
 
 /*
@@ -490 +490 @@
 //CB: todo: add missing metrics
 
-    case SM_CXICONSPACING: //TODO: size of grid cell for large icons
-        rc = OSLibWinQuerySysValue(SVOS_CXICON);
-        //CB: return standard windows icon size?
-        //rc = 32;
-        break;
+    case SM_CXICONSPACING: //Size of grid cell for large icons (view in File dialog)
+        rc = 64; //In NT4 it's (90,64)
+        break;
+
     case SM_CYICONSPACING:
-        rc = OSLibWinQuerySysValue(SVOS_CYICON);
         //read SM_CXICONSPACING comment
-        //rc = 32;
-        break;
+        rc = 64;
+        break;
+
     case SM_PENWINDOWS:
         rc = FALSE;
@@ -607 +606 @@
       case SPI_GETICONTITLEWRAP:
       case SPI_GETMENUDROPALIGNMENT:
-      case SPI_ICONHORIZONTALSPACING:
-      case SPI_ICONVERTICALSPACING:
       case SPI_LANGDRIVER:
       case SPI_SETFASTTASKSWITCH:
@@ -737 +734 @@
     case SPI_GETDRAGFULLWINDOWS:
         *(BOOL *)pvParam = OSLibWinQuerySysValue(SVOS_DYNAMICDRAG);
+        break;
+
+   case SPI_ICONHORIZONTALSPACING:
+        *(INT *)pvParam = 90; //GetSystemMetrics(SM_CXICONSPACING);
+        break;
+
+   case SPI_ICONVERTICALSPACING:
+        *(INT *)pvParam = 64; //GetSystemMetrics(SM_CYICONSPACING);
         break;