Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[EXPLORER] Implement taskbar application grouping #6889

Open
wants to merge 15 commits into
base: master
Choose a base branch
from
Open

[EXPLORER] Implement taskbar application grouping #6889

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
7b234fb
Temp commit to enable reviewing changes
StartForKiller Jul 28, 2023
d916e7e
Missing some files non staged
StartForKiller Jul 28, 2023
9d91e50
Change license header to new format
StartForKiller Jul 29, 2023
8170375
Remove debug DPRINTF
StartForKiller Jul 29, 2023
080a2a7
Merge pull request #1 from reactos/master
StartForKiller Jul 29, 2023
f2f9817
Fix theme related things
StartForKiller Feb 13, 2024
7b0d80b
Merge branch 'master' into CORE-15990
StartForKiller May 14, 2024
011af79
Fallback to first language declared on VarFileInfo/Translation
StartForKiller May 15, 2024
657988f
Move GetModuleFileNameExW usage and create a helper function to obtai…
StartForKiller May 15, 2024
ba12b2d
Add other languages and group taskbar grouping variables
StartForKiller May 15, 2024
718fe93
Reorder initialization too
StartForKiller May 15, 2024
39b1046
Probably fix all code formatting
StartForKiller May 15, 2024
7802513
Fix warning and regression
StartForKiller May 15, 2024
478a0e0
Hopefully fix msvc builds
StartForKiller May 16, 2024
e9b11f9
Fix double menu
StartForKiller May 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion base/shell/explorer/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,6 @@ add_rc_deps(explorer.rc ${explorer_rc_deps})
add_executable(explorer ${SOURCE} explorer.rc)
target_link_libraries(explorer uuid wine cpprt atl_classes)
set_module_type(explorer win32gui UNICODE)
add_importlibs(explorer advapi32 gdi32 user32 comctl32 ole32 oleaut32 shell32 browseui shlwapi shdocvw version uxtheme msvcrt kernel32 ntdll)
add_importlibs(explorer psapi advapi32 gdi32 user32 comctl32 ole32 oleaut32 shell32 browseui shlwapi shdocvw version uxtheme msvcrt kernel32 ntdll)
add_pch(explorer precomp.h SOURCE)
add_cd_file(TARGET explorer DESTINATION reactos FOR all)
13 changes: 13 additions & 0 deletions base/shell/explorer/lang/en-US.rc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,19 @@ BEGIN
END
END

IDM_TASKGRP MENUEX
StartForKiller marked this conversation as resolved.
Show resolved Hide resolved
BEGIN
POPUP ""
BEGIN
MENUITEM "Ca&scade", ID_SHELL_CMD_CASCADE_WND
MENUITEM "Tile &Horizontally", ID_SHELL_CMD_TILE_WND_H
MENUITEM "Tile V&ertically", ID_SHELL_CMD_TILE_WND_V
MENUITEM "&Minimize Group", ID_SHELL_CMD_MINIMIZE_GRP
MENUITEM SEPARATOR
MENUITEM "&Close Group", ID_SHELL_CMD_CLOSE_GRP
END
END

IDM_STARTMENU MENUEX
BEGIN
POPUP ""
Expand Down
3 changes: 3 additions & 0 deletions base/shell/explorer/resource.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@

#define IDM_STARTMENU 204
#define IDM_TRAYWND 205
#define IDM_TASKGRP 210
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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


/* NOTE: The following constants may *NOT* be changed because
they're hardcoded and need to be the exact values
Expand Down Expand Up @@ -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)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah i know, currently it's a TODO PR

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It was yes but not after my PR is merged.

Copy link
Contributor Author

@StartForKiller StartForKiller May 15, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, then, totally true

Loading
Loading