Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-28 19:32:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

Revert "[NTUSER] Enable SM_CXICON etc. settings from registry (#7679)" (#7682)

Browse source 
This reverts commit 3b3741c10a of #7679 .
It seems like the shell icon size is not the
system icon size.

The wide string L"Shell Small Icon Size" is detected in
shell32.dll and themeui.dll.
No L"Shell Small Icon Size" in win32k.sys found.
JIRA issue: CORE-12905
This commit is contained in:
Katayama Hirofumi MZ 2025-01-29 21:34:19 +09:00 committed by GitHub
parent 3b3741c10a
commit 2f23e70ad5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 4 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
win32ss/user/ntuser/metric.c
View file

@ -5,7 +5,6 @@
* FILE: win32ss/user/ntuser/metric.c * FILE: win32ss/user/ntuser/metric.c
* PROGRAMER: Casper S. Hornstrup (chorns@users.sourceforge.net) * PROGRAMER: Casper S. Hornstrup (chorns@users.sourceforge.net)
* Timo Kreuzer (timo.kreuzer@reactos.org) * Timo Kreuzer (timo.kreuzer@reactos.org)
* Katayama Hirofumi MZ (katayama.hirofumi.mz@gmail.com)
*/ */
#include <win32k.h> #include <win32k.h>
@ -131,10 +130,10 @@ InitMetrics(VOID)
piSysMet[SM_CXHTHUMB] = gspv.ncm.iScrollHeight; // 16; piSysMet[SM_CXHTHUMB] = gspv.ncm.iScrollHeight; // 16;
piSysMet[SM_CYVSCROLL] = gspv.ncm.iScrollHeight; // 16 piSysMet[SM_CYVSCROLL] = gspv.ncm.iScrollHeight; // 16
piSysMet[SM_CXHSCROLL] = gspv.ncm.iScrollHeight; // 16; piSysMet[SM_CXHSCROLL] = gspv.ncm.iScrollHeight; // 16;
piSysMet[SM_CXICON] = gspv.nIconSize; // 32 piSysMet[SM_CXICON] = 32;
piSysMet[SM_CYICON] = gspv.nIconSize; // 32 piSysMet[SM_CYICON] = 32;
piSysMet[SM_CXSMICON] = gspv.nSmallIconSize; // 16 piSysMet[SM_CXSMICON] = 16;
piSysMet[SM_CYSMICON] = gspv.nSmallIconSize; // 16 piSysMet[SM_CYSMICON] = 16;
piSysMet[SM_CXICONSPACING] = gspv.im.iHorzSpacing; // 64; piSysMet[SM_CXICONSPACING] = gspv.im.iHorzSpacing; // 64;
piSysMet[SM_CYICONSPACING] = gspv.im.iVertSpacing; // 64; piSysMet[SM_CYICONSPACING] = gspv.im.iVertSpacing; // 64;
piSysMet[SM_CXCURSOR] = 32; piSysMet[SM_CXCURSOR] = 32;

10
win32ss/user/ntuser/sysparams.c
View file

@ -4,7 +4,6 @@
* PURPOSE: System parameters functions * PURPOSE: System parameters functions
* FILE: win32ss/user/ntuser/sysparams.c * FILE: win32ss/user/ntuser/sysparams.c
* PROGRAMER: Timo Kreuzer (timo.kreuzer@reactos.org) * PROGRAMER: Timo Kreuzer (timo.kreuzer@reactos.org)
* Katayama Hirofumi MZ (katayama.hirofumi.mz@gmail.com)
*/ */
// TODO: // TODO:
@ -206,11 +205,6 @@ SpiFixupValues(VOID)
// gspv.tmMenuFont.tmExternalLeading); // gspv.tmMenuFont.tmExternalLeading);
if (gspv.iDblClickTime == 0) gspv.iDblClickTime = 500; if (gspv.iDblClickTime == 0) gspv.iDblClickTime = 500;
if (gspv.nIconSize <= 0)
gspv.nIconSize = 32;
if (gspv.nSmallIconSize <= 0)
gspv.nSmallIconSize = 16;
// FIXME: Hack!!! // FIXME: Hack!!!
gspv.tmMenuFont.tmHeight = 11; gspv.tmMenuFont.tmHeight = 11;
gspv.tmMenuFont.tmExternalLeading = 2; gspv.tmMenuFont.tmExternalLeading = 2;
@ -302,10 +296,6 @@ SpiUpdatePerUserSystemParameters(VOID)
gspv.im.iTitleWrap = SpiLoadMetric(VAL_ITWRAP, 1); gspv.im.iTitleWrap = SpiLoadMetric(VAL_ITWRAP, 1);
SpiLoadFont(&gspv.im.lfFont, L"IconFont", &lf1); SpiLoadFont(&gspv.im.lfFont, L"IconFont", &lf1);
/* Load icon size */
gspv.nIconSize = SpiLoadInt(KEY_METRIC, L"Shell Icon Size", 32);
gspv.nSmallIconSize = SpiLoadInt(KEY_METRIC, L"Shell Small Icon Size", 16);
/* Load desktop settings */ /* Load desktop settings */
gspv.bDragFullWindows = SpiLoadInt(KEY_DESKTOP, VAL_DRAG, 0); gspv.bDragFullWindows = SpiLoadInt(KEY_DESKTOP, VAL_DRAG, 0);
gspv.iWheelScrollLines = SpiLoadInt(KEY_DESKTOP, VAL_SCRLLLINES, 3); gspv.iWheelScrollLines = SpiLoadInt(KEY_DESKTOP, VAL_SCRLLLINES, 3);

3
win32ss/user/ntuser/sysparams.h
View file

@ -157,9 +157,6 @@ typedef struct _SPIVALUES
DWORD dwForegroundFlashCount; DWORD dwForegroundFlashCount;
DWORD dwCaretWidth; DWORD dwCaretWidth;
INT nIconSize;
INT nSmallIconSize;
// SPI_LANGDRIVER // SPI_LANGDRIVER
// SPI_SETDESKPATTERN // SPI_SETDESKPATTERN
// SPI_SETPENWINDOWS // SPI_SETPENWINDOWS