huwcampbell.com
Reactos
[TASKMGR] Allow setting each column alignment independently (#7208)
Add dwAlign attribute to the PresetColumnEntry structure to make it work.
CORE-19280
authored by
Jose Carlos Jesus
and committed by
GitHub
deccfb8c
045333e8
+30
-29
+29
-29
base/applications/taskmgr/column.c
+29
-29
base/applications/taskmgr/column.c
···
10
10
11
11
UINT ColumnDataHints[COLUMN_NMAX];
12
12
13
-
#define DECLARE_COLUMN_PRESET(_name, _size, _state) \
14
-
{ IDS_TAB_##_name, IDC_##_name, _size, _state },
13
+
#define DECLARE_COLUMN_PRESET(_name, _size, _state, _align) \
14
+
{ IDS_TAB_##_name, IDC_##_name, _size, _state, _align },
15
15
16
16
const PresetColumnEntry ColumnPresets[COLUMN_NMAX] = {
17
-
DECLARE_COLUMN_PRESET(IMAGENAME, 105, TRUE)
18
-
DECLARE_COLUMN_PRESET(PID, 50, TRUE)
19
-
DECLARE_COLUMN_PRESET(USERNAME, 107, FALSE)
20
-
DECLARE_COLUMN_PRESET(SESSIONID, 70, FALSE)
21
-
DECLARE_COLUMN_PRESET(CPUUSAGE, 35, TRUE)
22
-
DECLARE_COLUMN_PRESET(CPUTIME, 70, TRUE)
23
-
DECLARE_COLUMN_PRESET(MEMORYUSAGE, 70, TRUE)
24
-
DECLARE_COLUMN_PRESET(PEAKMEMORYUSAGE, 100, FALSE)
25
-
DECLARE_COLUMN_PRESET(MEMORYUSAGEDELTA, 70, FALSE)
26
-
DECLARE_COLUMN_PRESET(PAGEFAULTS, 70, FALSE)
27
-
DECLARE_COLUMN_PRESET(PAGEFAULTSDELTA, 70, FALSE)
28
-
DECLARE_COLUMN_PRESET(VIRTUALMEMORYSIZE, 70, FALSE)
29
-
DECLARE_COLUMN_PRESET(PAGEDPOOL, 70, FALSE)
30
-
DECLARE_COLUMN_PRESET(NONPAGEDPOOL, 70, FALSE)
31
-
DECLARE_COLUMN_PRESET(BASEPRIORITY, 60, FALSE)
32
-
DECLARE_COLUMN_PRESET(HANDLECOUNT, 60, FALSE)
33
-
DECLARE_COLUMN_PRESET(THREADCOUNT, 60, FALSE)
34
-
DECLARE_COLUMN_PRESET(USEROBJECTS, 60, FALSE)
35
-
DECLARE_COLUMN_PRESET(GDIOBJECTS, 60, FALSE)
36
-
DECLARE_COLUMN_PRESET(IOREADS, 70, FALSE)
37
-
DECLARE_COLUMN_PRESET(IOWRITES, 70, FALSE)
38
-
DECLARE_COLUMN_PRESET(IOOTHER, 70, FALSE)
39
-
DECLARE_COLUMN_PRESET(IOREADBYTES, 70, FALSE)
40
-
DECLARE_COLUMN_PRESET(IOWRITEBYTES, 70, FALSE)
41
-
DECLARE_COLUMN_PRESET(IOOTHERBYTES, 70, FALSE)
42
-
DECLARE_COLUMN_PRESET(COMMANDLINE, 450, FALSE)
17
+
DECLARE_COLUMN_PRESET(IMAGENAME, 105, TRUE, LVCFMT_LEFT)
18
+
DECLARE_COLUMN_PRESET(PID, 50, TRUE, LVCFMT_LEFT)
19
+
DECLARE_COLUMN_PRESET(USERNAME, 107, FALSE, LVCFMT_LEFT)
20
+
DECLARE_COLUMN_PRESET(SESSIONID, 70, FALSE, LVCFMT_LEFT)
21
+
DECLARE_COLUMN_PRESET(CPUUSAGE, 35, TRUE, LVCFMT_RIGHT)
22
+
DECLARE_COLUMN_PRESET(CPUTIME, 70, TRUE, LVCFMT_RIGHT)
23
+
DECLARE_COLUMN_PRESET(MEMORYUSAGE, 70, TRUE, LVCFMT_RIGHT)
24
+
DECLARE_COLUMN_PRESET(PEAKMEMORYUSAGE, 100, FALSE, LVCFMT_RIGHT)
25
+
DECLARE_COLUMN_PRESET(MEMORYUSAGEDELTA, 70, FALSE, LVCFMT_RIGHT)
26
+
DECLARE_COLUMN_PRESET(PAGEFAULTS, 70, FALSE, LVCFMT_RIGHT)
27
+
DECLARE_COLUMN_PRESET(PAGEFAULTSDELTA, 70, FALSE, LVCFMT_RIGHT)
28
+
DECLARE_COLUMN_PRESET(VIRTUALMEMORYSIZE, 70, FALSE, LVCFMT_RIGHT)
29
+
DECLARE_COLUMN_PRESET(PAGEDPOOL, 70, FALSE, LVCFMT_RIGHT)
30
+
DECLARE_COLUMN_PRESET(NONPAGEDPOOL, 70, FALSE, LVCFMT_RIGHT)
31
+
DECLARE_COLUMN_PRESET(BASEPRIORITY, 60, FALSE, LVCFMT_RIGHT)
32
+
DECLARE_COLUMN_PRESET(HANDLECOUNT, 60, FALSE, LVCFMT_RIGHT)
33
+
DECLARE_COLUMN_PRESET(THREADCOUNT, 60, FALSE, LVCFMT_RIGHT)
34
+
DECLARE_COLUMN_PRESET(USEROBJECTS, 60, FALSE, LVCFMT_RIGHT)
35
+
DECLARE_COLUMN_PRESET(GDIOBJECTS, 60, FALSE, LVCFMT_RIGHT)
36
+
DECLARE_COLUMN_PRESET(IOREADS, 70, FALSE, LVCFMT_RIGHT)
37
+
DECLARE_COLUMN_PRESET(IOWRITES, 70, FALSE, LVCFMT_RIGHT)
38
+
DECLARE_COLUMN_PRESET(IOOTHER, 70, FALSE, LVCFMT_RIGHT)
39
+
DECLARE_COLUMN_PRESET(IOREADBYTES, 70, FALSE, LVCFMT_RIGHT)
40
+
DECLARE_COLUMN_PRESET(IOWRITEBYTES, 70, FALSE, LVCFMT_RIGHT)
41
+
DECLARE_COLUMN_PRESET(IOOTHERBYTES, 70, FALSE, LVCFMT_RIGHT)
42
+
DECLARE_COLUMN_PRESET(COMMANDLINE, 450, FALSE, LVCFMT_LEFT)
43
43
};
44
44
45
45
static int InsertColumn(int nCol, LPCWSTR lpszColumnHeading, int nFormat, int nWidth, int nSubItem);
···
54
54
for (n=0; n<COLUMN_NMAX; n++) {
55
55
if (TaskManagerSettings.Columns[n]) {
56
56
LoadStringW(hInst, ColumnPresets[n].dwIdsName, szTemp, _countof(szTemp));
57
-
InsertColumn(n, szTemp, LVCFMT_LEFT, TaskManagerSettings.ColumnSizeArray[n], -1);
57
+
InsertColumn(n, szTemp, ColumnPresets[n].dwAlign, TaskManagerSettings.ColumnSizeArray[n], -1);
58
58
}
59
59
}
60
60