Skip to content

Fix windows tray issues by upgrading tray_manager; remove useless code #1137

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
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix windows tray issues by upgrading tray_manager; remove useless code #1137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 0 additions & 6 deletions lib/manager/window_manager.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,12 +102,6 @@ class _WindowContainerState extends ConsumerState<WindowManager>
super.onWindowMinimize();
}

@override
Future<void> onTaskbarCreated() async {
globalState.appController.updateTray(true);
super.onTaskbarCreated();
}

@override
Future<void> dispose() async {
windowManager.removeListener(this);
Expand Down
2 changes: 0 additions & 2 deletions plugins/window_ext/lib/window_ext_listener.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
abstract mixin class WindowExtListener {
void onTaskbarCreated() {}

void onShouldTerminate() {}
}
3 changes: 0 additions & 3 deletions plugins/window_ext/lib/window_ext_manager.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,6 @@ class WindowExtManager {
Future<void> _methodCallHandler(MethodCall call) async {
for (final WindowExtListener listener in _listeners) {
switch (call.method) {
case "taskbarCreated":
listener.onTaskbarCreated();
break;
case "shouldTerminate":
listener.onShouldTerminate();
break;
Expand Down
4 changes: 0 additions & 4 deletions plugins/window_ext/windows/window_ext_plugin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ void WindowExtPlugin::RegisterWithRegistrar(

WindowExtPlugin::WindowExtPlugin(flutter::PluginRegistrarWindows* registrar)
: registrar(registrar) {
WM_TASKBARCREATED = RegisterWindowMessage(TEXT("TaskbarCreated"));
window_proc_id = registrar->RegisterTopLevelWindowProcDelegate(
[this](HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam) {
return HandleWindowProc(hwnd, message, wparam, lparam);
Expand All @@ -58,9 +57,6 @@ std::optional<LRESULT> WindowExtPlugin::HandleWindowProc(HWND hWnd,
WPARAM wParam,
LPARAM lParam) {
std::optional<LRESULT> result;
if(message == WM_TASKBARCREATED){
channel -> InvokeMethod("taskbarCreated", std::make_unique<flutter::EncodableValue>());
}
return result;
}

Expand Down
1 change: 0 additions & 1 deletion plugins/window_ext/windows/window_ext_plugin.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ class WindowExtPlugin : public flutter::Plugin {
LPARAM lparam);

int window_proc_id = -1;
UINT WM_TASKBARCREATED = 0;
flutter::PluginRegistrarWindows *registrar;
};

Expand Down
4 changes: 2 additions & 2 deletions pubspec.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1378,10 +1378,10 @@ packages:
dependency: "direct main"
description:
name: tray_manager
sha256: c2da0f0f1ddb455e721cf68d05d1281fec75cf5df0a1d3cb67b6ca0bdfd5709d
sha256: ad18c4cd73003097d182884bacb0578ad2865f3ab842a0ad00f6d043ed49eaf0
url: "https://pub.dev"
source: hosted
version: "0.4.0"
version: "0.5.0"
typed_data:
dependency: transitive
description:
Expand Down
2 changes: 1 addition & 1 deletion pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ dependencies:
mobile_scanner: ^6.0.2
app_links: ^6.4.0
win32_registry: ^2.0.0
tray_manager: ^0.4.0
tray_manager: ^0.5.0
collection: ^1.18.0
animations: ^2.0.11
package_info_plus: ^8.0.0
Expand Down