Skip to content

feat: restore icon and context menu when Explorer restarts if necessary #71

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

Merged
lijy91 merged 5 commits into from
Apr 25, 2025
Merged

feat: restore icon and context menu when Explorer restarts if necessary #71

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c511354
[windows] feat: Add onWindowsTaskbarCreated Method.
brandon3343 Oct 27, 2023
dfd2751
chore: merge remote branch 'main'
pzhlkj6612 Apr 14, 2025
29803d1
refactor: make taskbar-related code comply to current code style
pzhlkj6612 Apr 15, 2025
f4c1735
feat: restore icon and context menu when Explorer restarts if possible
pzhlkj6612 Apr 15, 2025
d65b28d
feat: restore icon and context menu when Explorer restarts if necessary
pzhlkj6612 Apr 24, 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
26 changes: 18 additions & 8 deletions packages/tray_manager/windows/tray_manager_plugin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,16 @@ class TrayManagerPlugin : public flutter::Plugin {
flutter::PluginRegistrarWindows* registrar;
NOTIFYICONDATA nid;
NOTIFYICONIDENTIFIER niif;
HMENU hMenu;
// do create pop-up menu only once.
HMENU hMenu = CreatePopupMenu();
bool tray_icon_setted = false;
UINT windows_taskbar_created_message_id = 0;

// The ID of the WindowProc delegate registration.
int window_proc_id = -1;

void TrayManagerPlugin::_CreateMenu(HMENU menu, flutter::EncodableMap args);
void TrayManagerPlugin::_ApplyIcon();

// Called for top-level WindowProc delegation.
std::optional<LRESULT> TrayManagerPlugin::HandleWindowProc(HWND hwnd,
Expand Down Expand Up @@ -109,6 +112,7 @@ TrayManagerPlugin::TrayManagerPlugin(flutter::PluginRegistrarWindows* registrar)
[this](HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam) {
return HandleWindowProc(hwnd, message, wparam, lparam);
});
windows_taskbar_created_message_id = RegisterWindowMessage(L"TaskbarCreated");
}

TrayManagerPlugin::~TrayManagerPlugin() {
Expand Down Expand Up @@ -195,6 +199,12 @@ std::optional<LRESULT> TrayManagerPlugin::HandleWindowProc(HWND hWnd,
default:
return DefWindowProc(hWnd, message, wParam, lParam);
};
} else if (message == windows_taskbar_created_message_id) {
if (windows_taskbar_created_message_id != 0 && tray_icon_setted) {
// restore the icon with the existing resource.
tray_icon_setted = false;
_ApplyIcon();
}
}
return result;
}
Expand Down Expand Up @@ -224,22 +234,25 @@ void TrayManagerPlugin::SetIcon(

std::wstring_convert<std::codecvt_utf8_utf16<wchar_t>> converter;

HICON hIcon = static_cast<HICON>(
nid.hIcon = static_cast<HICON>(
LoadImage(nullptr, (LPCWSTR)(converter.from_bytes(iconPath).c_str()),
IMAGE_ICON, GetSystemMetrics(SM_CXSMICON),
GetSystemMetrics(SM_CYSMICON), LR_LOADFROMFILE));

_ApplyIcon();

result->Success(flutter::EncodableValue(true));
}

void TrayManagerPlugin::_ApplyIcon() {
if (tray_icon_setted) {
nid.hIcon = hIcon;
Shell_NotifyIcon(NIM_MODIFY, &nid);
} else {
nid.cbSize = sizeof(NOTIFYICONDATA);
nid.hWnd = GetMainWindow();
nid.uCallbackMessage = WM_MYMESSAGE;
nid.hIcon = hIcon;
nid.uFlags = NIF_MESSAGE | NIF_ICON;
Shell_NotifyIcon(NIM_ADD, &nid);
hMenu = CreatePopupMenu();
}

niif.cbSize = sizeof(NOTIFYICONIDENTIFIER);
Expand All @@ -248,8 +261,6 @@ void TrayManagerPlugin::SetIcon(
niif.guidItem = GUID_NULL;

tray_icon_setted = true;

result->Success(flutter::EncodableValue(true));
}

void TrayManagerPlugin::SetToolTip(
Expand All @@ -276,7 +287,6 @@ void TrayManagerPlugin::SetContextMenu(
const flutter::EncodableMap& args =
std::get<flutter::EncodableMap>(*method_call.arguments());

hMenu = CreatePopupMenu();
_CreateMenu(hMenu, std::get<flutter::EncodableMap>(
args.at(flutter::EncodableValue("menu"))));

Expand Down