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

Default (first) scroll should respect our settings #940

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Default (first) scroll should respect our settings #940

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c67667b
Update taskbar-volume-control.wh.cpp
ttodua Sep 8, 2024
79dc400
Update taskbar-volume-control.wh.cpp
ttodua Sep 8, 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
7 changes: 4 additions & 3 deletions mods/taskbar-volume-control.wh.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
// @description Control the system volume by scrolling over the taskbar
// @version 1.2.1
// @author m417z
// @github https://github.com/m417z

Check warning on line 7 in mods/taskbar-volume-control.wh.cpp

View workflow job for this annotation

GitHub Actions / Test changed files

// @twitter https://twitter.com/m417z
// @homepage https://m417z.com/
// @include explorer.exe
Expand Down Expand Up @@ -71,8 +71,9 @@
$name: Volume change step
$description: >-
Allows to configure the volume change that will occur with each notch of
mouse wheel movement. This option has effect only for the Windows 11, None
control indicators. For the Windows 11 indicator, must be a multiple of 2.
mouse wheel movement. For the Windows 11 indicator, must be a multiple of 2.
For Windows 10 style indicator, the step-size is only respected before Volume
indicator appears, after that it has fixed `2` step-size (unforunately, no fix atm).
- oldTaskbarOnWin11: false
$name: Customize the old taskbar on Windows 11
$description: >-
Expand Down Expand Up @@ -659,7 +660,7 @@
}

if (CanUseModernIndicator()) {
if (!AdjustVolumeLevelWithMouseWheel(GET_WHEEL_DELTA_WPARAM(wParam), 2))
if (!AdjustVolumeLevelWithMouseWheel(GET_WHEEL_DELTA_WPARAM(wParam), g_settings.volumeChangeStep))
return FALSE;

ShowSndVolModernIndicator();
Expand Down Expand Up @@ -1867,7 +1868,7 @@
return false;
}

SYMBOL_HOOK symbolHooks[] = {

Check warning on line 1871 in mods/taskbar-volume-control.wh.cpp

View workflow job for this annotation

GitHub Actions / Test changed files 

Please rename the symbol hooks variable to indicate the target module. Examples (can end with "hook" or "hooks"):
* user32DllHooks
* user32dll_hooks
* user32_dll_hooks
If the target module name can't be represented by a variable name, or if there is more than one target module, add all target modules in a comment above the symbol hooks variable, separated with commas. Example:
// explorer.exe, taskbar.dll
WindhawkUtils::SYMBOL_HOOK hooks[] = {...};
{
{LR"(public: void __cdecl winrt::SystemTray::implementation::VolumeSystemTrayIconDataModel::OnIconClicked(struct winrt::SystemTray::IconClickedEventArgs const &))"},
(void**)&VolumeSystemTrayIconDataModel_OnIconClicked_Original,
Expand Down
Loading