[EXPLORER] Implement taskbar application grouping #6889

StartForKiller · 2024-05-14T23:27:49Z

Purpose

I've implemented the task grouping function to taskbar.

JIRA issue: CORE-16134

Proposed changes

Added Taskbar grouping function.
Added option to enable and disable this function.
Maybe some hidden Windows Registry magic needs to be added to how tasks are grouped.

TODO

Find and solve related issues with themes

Merge main changes

whindsaks · 2024-05-14T23:47:13Z

base/shell/explorer/resource.h

@@ -216,3 +217,5 @@
 #define ID_SHELL_CMD_CUST_NOTIF (411)
 #define ID_SHELL_CMD_ADJUST_DAT (412)
 #define ID_SHELL_CMD_RESTORE_ALL (413)
+#define ID_SHELL_CMD_MINIMIZE_GRP (414)
+#define ID_SHELL_CMD_CLOSE_GRP (415)


If PR #6872 is merged before this (likely) then you need to adjust ID_SHELL_CMD_LAST before merging (likely a conflict).

Yeah i know, currently it's a TODO PR

The only thing is that ID_SHELL_CMD_LAST was 0x7FEF so it should be fine

It was yes but not after my PR is merged.

Ah, then, totally true

base/shell/explorer/taskswnd.cpp

…n process image path

HBelusca · 2024-05-15T17:49:00Z

src\base\shell\explorer\taskswnd.cpp(988): error C2065: '__INT_MAX__': undeclared identifier
Please use INT_MAX instead.

base/shell/explorer/util.cpp

base/shell/explorer/lang/en-US.rc

base/shell/explorer/taskswnd.cpp

HBelusca · 2024-05-16T10:00:03Z

There's something weird happening when the MSVC builders compile the (modified) explorer.rc ...

base/shell/explorer/lang/cs-CZ.rc

HBelusca · 2024-05-16T15:34:39Z

For information, builds are now working, except for those that have a problem in the github actions.

HBelusca

1st part of final review

HBelusca · 2024-05-16T15:36:58Z

base/shell/explorer/resource.h

@@ -55,6 +55,7 @@

 #define IDM_STARTMENU 204
 #define IDM_TRAYWND 205
+#define IDM_TASKGRP 210


Why 210 and not 206? You want to reserve space for extra menus for tray/taskbar here?

I don't exactly remember right now if this is right but i think that was xp behaviour. I don't exactly remember as this was added like a year ago

If that doesn't matter then yeah, we can use 206

We can leave this, I would just add a comment explaining where you got the numbers from.

HBelusca · 2024-05-16T15:37:59Z

base/shell/explorer/util.cpp

+GetProcessPath(IN DWORD dwProcessId,
+ OUT LPWSTR szBuffer,
+ IN DWORD cbBufLen)


Suggested change

GetProcessPath(IN DWORD dwProcessId,

OUT LPWSTR szBuffer,

IN DWORD cbBufLen)

GetProcessPath(

_In_ DWORD dwProcessId,

_Out_ LPWSTR szBuffer,

_In_ DWORD cbBufLen)

HBelusca · 2024-05-16T15:40:28Z

base/shell/explorer/util.cpp

+ HANDLE hTaskProc = OpenProcess(PROCESS_QUERY_INFORMATION | PROCESS_VM_READ, FALSE, dwProcessId);
+ BOOL bRet = FALSE;
+ if (hTaskProc != NULL)
+ {
+ if (GetModuleFileNameExW(hTaskProc, NULL, szBuffer, cbBufLen))
+ bRet = TRUE;
+
+ CloseHandle(hTaskProc);
+ }
+
+ return bRet;


Since we are in C++ we can put the variables in the middle of the code:

Suggested change

HANDLE hTaskProc = OpenProcess(PROCESS_QUERY_INFORMATION | PROCESS_VM_READ, FALSE, dwProcessId);

BOOL bRet = FALSE;

if (hTaskProc != NULL)

{

if (GetModuleFileNameExW(hTaskProc, NULL, szBuffer, cbBufLen))

bRet = TRUE;

CloseHandle(hTaskProc);

}

return bRet;

HANDLE hTaskProc = OpenProcess(PROCESS_QUERY_INFORMATION | PROCESS_VM_READ, FALSE, dwProcessId);

if (!hTaskProc)

return FALSE;

BOOL bRet = (GetModuleFileNameExW(hTaskProc, NULL, szBuffer, cbBufLen) != 0);

CloseHandle(hTaskProc);

return bRet;

HBelusca · 2024-05-16T15:42:12Z

base/shell/explorer/util.cpp

+ if (bRet == FALSE && cbTranslate >= sizeof(LANGCODEPAGE))
+ {
+ //Try to use the first language as a fallback
+


Suggested change

if (bRet == FALSE && cbTranslate >= sizeof(LANGCODEPAGE))

{

//Try to use the first language as a fallback

if (!bRet && cbTranslate >= sizeof(LANGCODEPAGE))

{

// Try to use the first language as a fallback

HBelusca · 2024-05-16T15:42:32Z

base/shell/explorer/util.cpp

+ _countof(szSubBlock),
+ L"\\StringFileInfo\\%04X%04X\\%s",
+ lpTranslate[0].wLanguage,
+ lpTranslate[0].wCodePage,
+ szVersionInfo);


Suggested change

_countof(szSubBlock),

L"\\StringFileInfo\\%04X%04X\\%s",

lpTranslate[0].wLanguage,

lpTranslate[0].wCodePage,

szVersionInfo);

_countof(szSubBlock),

L"\\StringFileInfo\\%04X%04X\\%s",

lpTranslate[0].wLanguage,

lpTranslate[0].wCodePage,

szVersionInfo);

HBelusca · 2024-05-16T16:15:49Z

base/shell/explorer/taskswnd.cpp

+ RECT rcBitmap = nmtbcd->nmcd.rc;
+ RECT rcArrow = nmtbcd->nmcd.rc;
+ InflateRect(&rcText, -GetSystemMetrics(SM_CXEDGE), 0);
+ rcText.left += bitmapWidth + 6; //TODO Default list gap


Suggested change

rcText.left += bitmapWidth + 6; //TODO Default list gap

rcText.left += bitmapWidth + 6; // TODO: Default list gap

HBelusca · 2024-05-16T16:16:02Z

base/shell/explorer/taskswnd.cpp

+ rcBitmap.top++;
+ }
+
+ rcArrow.left = max(rcArrow.left, rcArrow.right - 13);


What's this "13" about?

I think is a prepcalculated x offset, i could try to add the formula there, but u think is always a constant and always the same

You could add a #define for this that uses the calculation.

HBelusca · 2024-05-16T16:16:19Z

base/shell/explorer/taskswnd.cpp

+ ImageList_Draw(m_ImageList, TaskGroup->Index, nmtbcd->nmcd.hdc, rcBitmap.left, rcBitmap.top, (btni.fsState & CDIS_MARKED) ? ILD_BLEND50 | ILD_TRANSPARENT : ILD_TRANSPARENT);
+
+ WCHAR TaskCountText[20];
+ StringCbPrintfW(TaskCountText, 20, L"(%d)", TaskGroup->dwTaskCount);


Suggested change

StringCbPrintfW(TaskCountText, 20, L"(%d)", TaskGroup->dwTaskCount);

StringCbPrintfW(TaskCountText, sizeof(TaskCountText), L"(%d)", TaskGroup->dwTaskCount);

HBelusca · 2024-05-16T16:16:43Z

base/shell/explorer/taskswnd.cpp

+ INT x, y;
+ HPEN hPen, hOldPen;
+
+ if (!(hPen = CreatePen( PS_SOLID, 1, nmtbcd->clrText)))


Suggested change

if (!(hPen = CreatePen( PS_SOLID, 1, nmtbcd->clrText)))

if (!(hPen = CreatePen(PS_SOLID, 1, nmtbcd->clrText)))

HBelusca · 2024-05-16T16:17:41Z

base/shell/explorer/taskswnd.cpp

@@ -1747,27 +2640,31 @@ class CTaskSwitchWnd :

 switch (nmh->code)
 {
- case NM_CUSTOMDRAW:


Not sure the reformatting here is useful.

That's exactly to comply with the formatting rules

StartForKiller · 2024-05-16T17:27:17Z

I will solve all the requests tomorrow

cbialorucki

This PR will need some work before it can get merged. The author of this PR suggested in the past that he was willing to have us finish this work without needing his intervention since he is busy. I reached out to him to make sure he is still okay with this. If he allows us, we will commit fixes directly to this PR to clean it up before merging it.

Update: He says he will be back in about a week, but we can help clean it up in the meantime.

cbialorucki · 2024-05-23T02:34:05Z

base/shell/explorer/resource.h

@@ -55,6 +55,7 @@

 #define IDM_STARTMENU 204
 #define IDM_TRAYWND 205
+#define IDM_TASKGRP 210


We can leave this, I would just add a comment explaining where you got the numbers from.

StartForKiller added 6 commits July 28, 2023 22:58

Temp commit to enable reviewing changes

7b234fb

Missing some files non staged

d916e7e

Change license header to new format

9d91e50

Remove debug DPRINTF

8170375

Merge pull request #1 from reactos/master

080a2a7

Merge main changes

Fix theme related things

f2f9817

StartForKiller requested review from learn-more and yagoulas as code owners May 14, 2024 23:27

github-actions bot added the shell All PR's related to the shell (and shell extensions) label May 14, 2024

Merge branch 'master' into CORE-15990

7b0d80b

cbialorucki requested review from HBelusca, katahiromz, cbialorucki and whindsaks May 14, 2024 23:35

whindsaks reviewed May 14, 2024

View reviewed changes

StartForKiller added 2 commits May 15, 2024 02:33

Fallback to first language declared on VarFileInfo/Translation

011af79

Move GetModuleFileNameExW usage and create a helper function to obtai…

657988f

…n process image path

binarymaster added the enhancement For PRs with an enhancement/new feature. label May 15, 2024

binarymaster added this to New PRs in ReactOS PRs via automation May 15, 2024

binarymaster changed the title ~~[EXPLORER] Implement Taskbar Application Grouping~~ [EXPLORER] Implement taskbar application grouping May 15, 2024

HBelusca reviewed May 15, 2024

View reviewed changes

HBelusca self-requested a review May 15, 2024 17:54

StartForKiller added 4 commits May 15, 2024 20:32

Add other languages and group taskbar grouping variables

ba12b2d

Reorder initialization too

718fe93

Probably fix all code formatting

39b1046

Fix warning and regression

7802513

HBelusca requested changes May 16, 2024

View reviewed changes

base/shell/explorer/lang/cs-CZ.rc Outdated Show resolved Hide resolved

ReactOS PRs automation moved this from New PRs to WIP / Waiting on contributor May 16, 2024

StartForKiller added 2 commits May 16, 2024 16:15

Hopefully fix msvc builds

478a0e0

Fix double menu

e9b11f9

StartForKiller requested a review from HBelusca May 16, 2024 14:46

HBelusca reviewed May 16, 2024

View reviewed changes

cbialorucki added the help wanted Request for help. label May 21, 2024

cbialorucki requested changes May 23, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[EXPLORER] Implement taskbar application grouping #6889

[EXPLORER] Implement taskbar application grouping #6889

StartForKiller commented May 14, 2024 •

edited by HBelusca

whindsaks May 14, 2024

StartForKiller May 14, 2024

StartForKiller May 15, 2024

whindsaks May 15, 2024

StartForKiller May 15, 2024 •

edited

HBelusca commented May 15, 2024

HBelusca commented May 16, 2024

HBelusca commented May 16, 2024

HBelusca left a comment

HBelusca May 16, 2024

StartForKiller May 16, 2024

StartForKiller May 16, 2024

cbialorucki May 23, 2024

HBelusca May 16, 2024

HBelusca May 16, 2024

StartForKiller May 16, 2024

HBelusca May 16, 2024 •

edited

HBelusca May 16, 2024

HBelusca May 16, 2024

HBelusca May 16, 2024

StartForKiller May 16, 2024

cbialorucki May 23, 2024 •

edited

HBelusca May 16, 2024

HBelusca May 16, 2024

HBelusca May 16, 2024

StartForKiller May 16, 2024

StartForKiller commented May 16, 2024

cbialorucki left a comment •

edited

cbialorucki May 23, 2024

	rcText.left += bitmapWidth + 6; //TODO Default list gap
	rcText.left += bitmapWidth + 6; // TODO: Default list gap

	StringCbPrintfW(TaskCountText, 20, L"(%d)", TaskGroup->dwTaskCount);
	StringCbPrintfW(TaskCountText, sizeof(TaskCountText), L"(%d)", TaskGroup->dwTaskCount);

	if (!(hPen = CreatePen( PS_SOLID, 1, nmtbcd->clrText)))
	if (!(hPen = CreatePen(PS_SOLID, 1, nmtbcd->clrText)))

[EXPLORER] Implement taskbar application grouping #6889

Are you sure you want to change the base?

[EXPLORER] Implement taskbar application grouping #6889

Conversation

StartForKiller commented May 14, 2024 • edited by HBelusca

Purpose

Proposed changes

TODO

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

StartForKiller May 15, 2024 • edited

Choose a reason for hiding this comment

HBelusca commented May 15, 2024

HBelusca commented May 16, 2024

HBelusca commented May 16, 2024

HBelusca left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

HBelusca May 16, 2024 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

cbialorucki May 23, 2024 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

StartForKiller commented May 16, 2024

cbialorucki left a comment • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

StartForKiller commented May 14, 2024 •

edited by HBelusca

StartForKiller May 15, 2024 •

edited

HBelusca May 16, 2024 •

edited

cbialorucki May 23, 2024 •

edited

cbialorucki left a comment •

edited