Skip to content

Feat: New tray-icon that adapts to theme change #33321

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

Open
HO-COOH wants to merge 2 commits into
base: main
Choose a base branch
from
+47 −1
Open

Feat: New tray-icon that adapts to theme change #33321

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
012d7bc
Feat: New tray-icon that adapts to theme change
HO-COOH Jun 10, 2024
d5b3535
Merge branch 'main' into feat/tray-icon
HO-COOH Dec 5, 2025
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
22 changes: 22 additions & 0 deletions src/runner/runner.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,28 @@
<ItemGroup>
<EmbeddedResource Include="Resources.resx" />
</ItemGroup>
<ItemGroup>
<CopyFileToFolders Include="svgs\PowerToysDark.ico">
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</DeploymentContent>
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</DeploymentContent>
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">$(OutDir)\svgs</DestinationFolders>
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">$(OutDir)\svgs</DestinationFolders>
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)\svgs</DestinationFolders>
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\svgs</DestinationFolders>
</CopyFileToFolders>
<CopyFileToFolders Include="svgs\PowerToysWhite.ico">
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</DeploymentContent>
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</DeploymentContent>
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">$(OutDir)\svgs</DestinationFolders>
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">$(OutDir)\svgs</DestinationFolders>
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)\svgs</DestinationFolders>
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\svgs</DestinationFolders>
</CopyFileToFolders>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<Import Project="..\..\deps\spdlog.props" />
<ImportGroup Label="ExtensionTargets">
Expand Down
2 changes: 2 additions & 0 deletions src/runner/runner.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,8 @@
</ItemGroup>
<ItemGroup>
<CopyFileToFolders Include="svgs\icon.ico" />
<CopyFileToFolders Include="svgs\PowerToysDark.ico" />
<CopyFileToFolders Include="svgs\PowerToysWhite.ico" />
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
Expand Down
Binary file added src/runner/svgs/PowerToysDark.ico
View file
Open in desktop
Binary file not shown.
Binary file added src/runner/svgs/PowerToysWhite.ico
View file
Open in desktop
Binary file not shown.
24 changes: 23 additions & 1 deletion src/runner/tray_icon.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
#include <common/version/version.h>
#include <common/logger/logger.h>
#include <common/utils/elevation.h>
#include <common/Themes/theme_listener.h>
#include "bug_report.h"

namespace
Expand All @@ -37,6 +38,7 @@
bool double_clicked = false;
POINT tray_icon_click_point;

static ThemeListener theme_listener;
}

// Struct to fill with callback and the data. The window_proc is responsible for cleaning it.
Expand Down Expand Up @@ -262,6 +264,25 @@
return DefWindowProc(window, message, wparam, lparam);
}

static HICON get_icon(AppTheme theme)
{
return static_cast<HICON>(LoadImage(NULL,
theme == AppTheme::Dark ?
L"svgs/PowerToysWhite.ico" :
L"svgs/PowerToysDark.ico",
IMAGE_ICON,
0,
0,
LR_LOADFROMFILE | LR_DEFAULTSIZE | LR_SHARED));
}


static void handle_theme_change()
{
tray_icon_data.hIcon = get_icon(theme_listener.AppTheme);
Shell_NotifyIcon(NIM_MODIFY, &tray_icon_data);
}

void update_bug_report_menu_status(bool isRunning)
{
if (h_sub_menu != nullptr)
Expand All @@ -273,7 +294,7 @@
void start_tray_icon(bool isProcessElevated)
{
auto h_instance = reinterpret_cast<HINSTANCE>(&__ImageBase);
auto icon = LoadIcon(h_instance, MAKEINTRESOURCE(APPICON));
HICON const icon = get_icon(theme_listener.AppTheme);
if (icon)
{
UINT id_tray_icon = 1;
Expand Down Expand Up @@ -320,6 +341,7 @@
ChangeWindowMessageFilterEx(hwnd, WM_COMMAND, MSGFLT_ALLOW, nullptr);

tray_icon_created = Shell_NotifyIcon(NIM_ADD, &tray_icon_data) == TRUE;
theme_listener.AddChangedHandler(&handle_theme_change);

// Register callback to update bug report menu item status
BugReportManager::instance().register_callback([](bool isRunning) {
Expand Down
Loading