Add desktop-icons-toggle mod#2267

Closed

Cinabutts wants to merge 23 commits intoramensoftware:mainfrom

Cinabutts commented Aug 7, 2025

Description:
Toggle desktop icon visibility with a customizable hotkey (default Ctrl+Alt+D). Includes support for configurable modifiers and key. Tested on Windows 11 24h2 (64-bit).
Icons automatically restore when the mod is disabled. Lightweight and user-friendly.

This mod was cobbled together out of multiple hours of work with AI and a moderate level of understanding.
There is also a AHK script I created to coincide meant to link to this mods hotkey which will be up in my Win11 repo soon, This is so that you can call it from the other mod "taskbar-empty-space-clicks" ie Middle click = calls ahk which triggers the hotkey associated with this mod.

Cinabutts added 2 commits

August 7, 2025 04:55


          Add desktop-icons-toggle mod

0aa84f7


          Changed Desc

edce8c9

Cinabutts marked this pull request as ready for review

August 7, 2025 11:30


          Merge remote-tracking branch 'upstream/main'

c2ef3f1

m417z reviewed

View reviewed changes

Member

m417z left a comment

Thanks for the submission. I appreciate the effort, but unfortunately AI code like this tends to be lower quality, and is difficult to review and fix since nobody understands why it's implemented that way.

I left some comments form an initial pass over the code. I'd be happy to merge the mod, as I think it can be helpful for other users, but I'm reluctant to merge low-quality code which seems to be working but is wrong and can cause problems in subtle ways.

mods/desktop-icons-toggle.wh.cpp Outdated

+                          g_state.hShellViewWindow,
+                          GWLP_WNDPROC,
+                          (LONG_PTR)CustomShellViewWndProc
+                      );

Member

m417z Aug 7, 2025

Using SetWindowLongPtrW can cause problems if multiple mods subclass the same window. Please use WindhawkUtils::SetWindowSubclassFromAnyThread. See wiki for details: https://github.com/ramensoftware/windhawk/wiki/Development-tips.

mods/desktop-icons-toggle.wh.cpp

+                  // Load settings from Windhawk
+                  g_state.bUseCtrl = (BOOL)Wh_GetIntSetting(L"UseCtrl", TRUE);
+                  g_state.bUseAlt = (BOOL)Wh_GetIntSetting(L"UseAlt", TRUE);
+                  PCWSTR hotkeyCharStr = Wh_GetStringSetting(L"HotkeyChar");

Member

m417z Aug 7, 2025

Use Wh_FreeStringSetting to free the memory.

mods/desktop-icons-toggle.wh.cpp Outdated

+              // Load settings from Windhawk configuration
+              void LoadSettings() {
+                  // Load settings from Windhawk
+                  g_state.bUseCtrl = (BOOL)Wh_GetIntSetting(L"UseCtrl", TRUE);

Member

m417z Aug 7, 2025

The TRUE is incorrect, it should be just a single argument - the name of the setting.

mods/desktop-icons-toggle.wh.cpp

+                  LoadSettings();
+                  // Find desktop ListView
+                  g_state.hDesktopListView = FindDesktopListView();

Member

m417z Aug 7, 2025

This mod is injected into all explorer.exe instances. Add a check that hDesktopListView that you found belongs to the current process by using GetCurrentProcessId and GetWindowThreadProcessId.

mods/desktop-icons-toggle.wh.cpp Outdated

+              void ToggleDesktopIcons() {
+                  Wh_Log(L"ToggleDesktopIcons called");
+                  if (!g_state.hDesktopListView) {

Member

m417z Aug 7, 2025

How is it possible for hDesktopListView to be null here?

mods/desktop-icons-toggle.wh.cpp Outdated

+                  HWND hListView = FindWindowExW(hShellView, nullptr, L"SysListView32", L"FolderView");
+                  if (hListView) {
+                      Wh_Log(L"Found desktop ListView: %p", hListView);
+                      return hListView;

Member

m417z Aug 7, 2025

This mod is injected into all explorer.exe instances. Add a check that hDesktopListView that you found belongs to the current process by using GetCurrentProcessId and GetWindowThreadProcessId.

mods/desktop-icons-toggle.wh.cpp Outdated

+                  // Try to find ListView again if not found initially
+                  if (!g_state.hDesktopListView) {
+                      Sleep(2000); // Give explorer more time to fully load

Member

m417z Aug 7, 2025

That won't work, it will just delay explorer loading on boot, as it blocks the process launch. You can either use a new thread, or hook a function such as CreateWindowExW to detect when it's created.

mods/desktop-icons-toggle.wh.cpp Outdated

+                  if (!g_state.bInitialized) {
+                      return;
+                  }

Member

m417z Aug 7, 2025

bInitialized isn't needed, it's always true here.

mods/desktop-icons-toggle.wh.cpp Outdated

+              // Called before uninitialization
+              void Wh_ModBeforeUninit() {
+                  Wh_Log(L"Desktop Icons Toggle mod before uninit");
+                  RestoreIconsToVisible();

Member

m417z Aug 7, 2025

It's already called in Wh_ModUninit.

mods/desktop-icons-toggle.wh.cpp Outdated

+                      }
+                  }
+                  // Also subclass the ListView as a fallback

Member

m417z Aug 7, 2025

Why is this fallback needed?


          Removed all but mod desktop-icons-toggle

ebd9cd7

Copilot AI review requested due to automatic review settings

August 21, 2025 23:27

This comment was marked as outdated.

Sign in to view

Copilot AI and others added 3 commits

September 3, 2025 09:11


          Initial plan

435ffe3


          Add missing WM_HOTKEY handling and improve robustness

Co-authored-by: Cinabutts <31424969+Cinabutts@users.noreply.github.com>


          Improve case handling, defensive programming, and fix typos

8ad5336

Co-authored-by: Cinabutts <31424969+Cinabutts@users.noreply.github.com>

Cinabutts requested a review from Copilot

September 3, 2025 09:29

Copilot AI reviewed

View reviewed changes

Copilot AI left a comment

Pull Request Overview

This PR introduces a new Windhawk mod that adds desktop icon visibility toggle functionality with customizable hotkey support (default Ctrl+Alt+D). The mod provides a lightweight solution for hiding/showing desktop icons on Windows 11 with automatic restoration when disabled.

Key Changes:

Implementation of desktop icons toggle functionality with hotkey support
Configurable modifier keys and primary key combinations
Automatic icon restoration when mod is disabled

Reviewed Changes

Copilot reviewed 65 out of 261 changed files in this pull request and generated no comments.

Show a summary per file

File	Description
mods/dark-theme-browser-colors-fix.wh.cpp	Removed existing mod file
mods/dark-menus.wh.cpp	Removed existing mod file
mods/custom-shutdown-dialog.wh.cpp	Removed existing mod file
mods/custom-desktop-watermark.wh.cpp	Removed existing mod file
mods/console-error-to-ding.wh.cpp	Removed existing mod file
mods/clientedge-in-apps.wh.cpp	Removed existing mod file
mods/classic-winver.wh.cpp	Removed existing mod file
mods/classic-uwp-fix.wh.cpp	Removed existing mod file
mods/classic-theme-transparency-fix.wh.cpp	Removed existing mod file
mods/classic-theme-explorer-search-fix.wh.cpp	Removed existing mod file
mods/classic-theme-explorer-lite.wh.cpp	Removed existing mod file
mods/classic-theme-enable.wh.cpp	Removed existing mod file
mods/classic-theme-enable-with-extended-compatibility.wh.cpp	Removed existing mod file
mods/classic-taskdlg-fix.wh.cpp	Removed existing mod file
mods/classic-taskbar-context-menu.wh.cpp	Removed existing mod file

_{Tip: Customize your code reviews with copilot-instructions.md. Create the file or learn how to get started.}

Copilot AI and others added 14 commits

September 3, 2025 09:42


          Replace SetWindowLongPtrW with WindhawkUtils::SetWindowSubclassFromAn…

…yThread and address developer feedback

Co-authored-by: Cinabutts <31424969+Cinabutts@users.noreply.github.com>


          Fix compilation errors: correct CharUpperW casting and window procedu…

0a48178

…re signatures

Co-authored-by: Cinabutts <31424969+Cinabutts@users.noreply.github.com>


          Remove accidentally committed test file

66b5d9c

Co-authored-by: Cinabutts <31424969+Cinabutts@users.noreply.github.com>


          Fix CharUpperW casting errors by using direct character conversion

69b1eec

Co-authored-by: Cinabutts <31424969+Cinabutts@users.noreply.github.com>


          Update settings structure to match taskbar-button-click reference mod…

7d726b8

… pattern

Co-authored-by: Cinabutts <31424969+Cinabutts@users.noreply.github.com>


          Fix linker errors by adding missing -lcomctl32 compiler option

66f1c6e

Co-authored-by: Cinabutts <31424969+Cinabutts@users.noreply.github.com>


          Update mods/desktop-icons-toggle.wh.cpp

cd9f743

Casting wParam to char is unsafe for Unicode characters. Use %lc format specifier with (wchar_t)wParam or %u with (unsigned)wParam instead.

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>


          Update mods/desktop-icons-toggle.wh.cpp

cc09687

Memory leak: Wh_FreeStringSetting is called unconditionally, but hotkeyCharStr could be NULL if Wh_GetStringSetting failed. The function should only be called when hotkeyCharStr is not NULL.

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>


          Fix ShowWindow return value interpretation causing false failure mess…

17d1438

…ages

Co-authored-by: Cinabutts <31424969+Cinabutts@users.noreply.github.com>


          Clean up duplicate and redundant code by adding helper functions

3e42216

Co-authored-by: Cinabutts <31424969+Cinabutts@users.noreply.github.com>


          Improve hotkey error message clarity and update version to 1.3.1

a9bb81d

Co-authored-by: Cinabutts <31424969+Cinabutts@users.noreply.github.com>


          Update log message for hotkey registration error

99191c6

removed "this is normal" line.


          Merge pull request #2 fixed via Copilot

1c58fe5

Fix Desktop Icons Toggle mod compilation errors and improve code quality


          Merge remote-tracking branch 'upstream/main'

ef9932d

Cinabutts requested a review from m417z

September 3, 2025 12:31

Cinabutts added 2 commits

September 3, 2025 08:58


          removed all other stuff again, refactored code

5c5278e


          Merge remote-tracking branch 'upstream/main'

4e5d494

Cinabutts deleted the branch ramensoftware:main

December 21, 2025 03:57

Cinabutts closed this

Cinabutts deleted the main branch

December 21, 2025 03:57

m417z mentioned this pull request

First official release of the Taskbar ContentPresenter Injector mod #2909

Merged

Cinabutts mentioned this pull request

Add: Desktop-icons-toggle #2968

Closed

Cinabutts added a commit to Cinabutts/windhawk-mods that referenced this pull request


          Fix: Added copilots suggestions

647b3a8

**Major Changes:**

1. **Window Subclassing System Overhaul (Comments [1](ramensoftware#2267 (comment)), [10](ramensoftware#2267 (comment)
   - Replaced `SetWindowLongPtrW` with `WindhawkUtils::SetWindowSubclassFromAnyThread` for all window subclassing
   - Updated subclass callbacks to use the standard `DWORD_PTR` refData parameter (matches `SetWindowSubclass`/WindhawkUtils expectations)
   - Removed fallback ListView subclassing (SHELLDLL_DefView handles input properly)
   - Added proper cleanup with `RemoveWindowSubclassFromAnyThread` in WM_NCDESTROY handlers
   - Updated function signatures to use `DefSubclassProc` instead of `CallWindowProcW`

2. **Process Isolation (Comments [4](ramensoftware#2267 (comment)), [6](ramensoftware#2267 (comment)
   - Added `IsWindowInCurrentProcess()` helper function
   - Now verifies ListView and ShellView belong to current explorer.exe process
   - Added a process check for `SHELLDLL_DefView` under Progman; if not current-process, falls back to WorkerW search
   - Prevents the mod from affecting other explorer processes

3. **Settings API Fixes (Comments [2](ramensoftware#2267 (comment)), [3](ramensoftware#2267 (comment)
   - Fixed `Wh_GetIntSetting` calls to use single argument (removed incorrect TRUE parameter)
   - Added `Wh_FreeStringSetting` to properly free string memory
   - Changed settings structure to nested `modifierKeys` object (matches Windhawk patterns)

4. **Initialization Improvements (Comments [7](ramensoftware#2267 (comment)), [8](ramensoftware#2267 (comment)
   - Removed `Sleep(2000)` hack from `Wh_ModAfterInit`
   - Removed unnecessary `bInitialized` flag
   - Added `EnsureValidListView()` helper for dynamic ListView validation
   - ListView now re-discovered on-demand if window becomes invalid
   - After settings changes, re-discovers shell/ListView handles and refreshes visibility state before re-establishing subclasses (hotkeys keep working)

5. **Code Cleanup (Comments [5](ramensoftware#2267 (comment)), [9](ramensoftware#2267 (comment)
   - Removed redundant `RestoreIconsToVisible` call from `Wh_ModBeforeUninit` (already in Wh_ModUninit)
   - Added null checks and proper error handling throughout
   - Added `ToUpperCase()` helper for case-insensitive key matching
   - WM_CHAR handling now requires Ctrl when configured and respects Alt, preventing false positives from control codes

**Additional Improvements:**
- Added `<commctrl.h>` and `<windhawk_utils.h>` includes
- Added `--optimize=0 --debug` compiler options
- Enhanced documentation in readme with modifier key details
- Better logging and error messages throughout

Cinabutts added a commit to Cinabutts/windhawk-mods that referenced this pull request


          Update: Desktop Icons Toggle 1.3.1 - 1.3.2

e998a2e

**Major Changes:**

1. **Window Subclassing System Overhaul (Comments [1](ramensoftware#2267 (comment)), [10](ramensoftware#2267 (comment)
   - Replaced `SetWindowLongPtrW` with `WindhawkUtils::SetWindowSubclassFromAnyThread` for all window subclassing
   - Updated subclass callbacks to use the standard `DWORD_PTR` refData parameter (matches `SetWindowSubclass`/WindhawkUtils expectations)
   - Removed fallback ListView subclassing (SHELLDLL_DefView handles input properly)
   - Added proper cleanup with `RemoveWindowSubclassFromAnyThread` in WM_NCDESTROY handlers
   - Updated function signatures to use `DefSubclassProc` instead of `CallWindowProcW`

2. **Process Isolation (Comments [4](ramensoftware#2267 (comment)), [6](ramensoftware#2267 (comment)
   - Added `IsWindowInCurrentProcess()` helper function
   - Now verifies ListView and ShellView belong to current explorer.exe process
   - Added a process check for `SHELLDLL_DefView` under Progman; if not current-process, falls back to WorkerW search
   - Prevents the mod from affecting other explorer processes

3. **Settings API Fixes (Comments [2](ramensoftware#2267 (comment)), [3](ramensoftware#2267 (comment)
   - Fixed `Wh_GetIntSetting` calls to use single argument (removed incorrect TRUE parameter)
   - Added `Wh_FreeStringSetting` to properly free string memory
   - Changed settings structure to nested `modifierKeys` object (matches Windhawk patterns)

4. **Initialization Improvements (Comments [7](ramensoftware#2267 (comment)), [8](ramensoftware#2267 (comment)
   - Removed `Sleep(2000)` hack from `Wh_ModAfterInit`
   - Removed unnecessary `bInitialized` flag
   - Added `EnsureValidListView()` helper for dynamic ListView validation
   - ListView now re-discovered on-demand if window becomes invalid
   - After settings changes, re-discovers shell/ListView handles and refreshes visibility state before re-establishing subclasses (hotkeys keep working)

5. **Code Cleanup (Comments [5](ramensoftware#2267 (comment)), [9](ramensoftware#2267 (comment)
   - Removed redundant `RestoreIconsToVisible` call from `Wh_ModBeforeUninit` (already in Wh_ModUninit)
   - Added null checks and proper error handling throughout
   - Added `ToUpperCase()` helper for case-insensitive key matching
   - WM_CHAR handling now requires Ctrl when configured and respects Alt, preventing false positives from control codes

**Additional Improvements:**
- Added `<commctrl.h>` and `<windhawk_utils.h>` includes
- Added `--optimize=0 --debug` compiler options
- Enhanced documentation in readme with modifier key details
- Better logging and error messages throughout

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet