From 6998c87b628ef9d87b2228676ecc4b40040236f3 Mon Sep 17 00:00:00 2001 From: krille-chan Date: Sun, 7 Apr 2024 15:20:21 +0200 Subject: [PATCH] Revert "build: Use libhandy for linux desktop again" This reverts commit 6349afae2beebabf696ec9815f9bc8bfb954e8d9. --- linux/flutter/generated_plugin_registrant.cc | 4 ---- linux/flutter/generated_plugins.cmake | 1 - linux/my_application.cc | 5 ++--- pubspec.lock | 8 -------- pubspec.yaml | 1 - 5 files changed, 2 insertions(+), 17 deletions(-) diff --git a/linux/flutter/generated_plugin_registrant.cc b/linux/flutter/generated_plugin_registrant.cc index b5155de2..18e739cd 100644 --- a/linux/flutter/generated_plugin_registrant.cc +++ b/linux/flutter/generated_plugin_registrant.cc @@ -12,7 +12,6 @@ #include #include #include -#include #include #include #include @@ -38,9 +37,6 @@ void fl_register_plugins(FlPluginRegistry* registry) { g_autoptr(FlPluginRegistrar) flutter_webrtc_registrar = fl_plugin_registry_get_registrar_for_plugin(registry, "FlutterWebRTCPlugin"); flutter_web_r_t_c_plugin_register_with_registrar(flutter_webrtc_registrar); - g_autoptr(FlPluginRegistrar) handy_window_registrar = - fl_plugin_registry_get_registrar_for_plugin(registry, "HandyWindowPlugin"); - handy_window_plugin_register_with_registrar(handy_window_registrar); g_autoptr(FlPluginRegistrar) pasteboard_registrar = fl_plugin_registry_get_registrar_for_plugin(registry, "PasteboardPlugin"); pasteboard_plugin_register_with_registrar(pasteboard_registrar); diff --git a/linux/flutter/generated_plugins.cmake b/linux/flutter/generated_plugins.cmake index dab6fedf..b4a43e1b 100644 --- a/linux/flutter/generated_plugins.cmake +++ b/linux/flutter/generated_plugins.cmake @@ -9,7 +9,6 @@ list(APPEND FLUTTER_PLUGIN_LIST file_selector_linux flutter_secure_storage_linux flutter_webrtc - handy_window pasteboard record_linux sqlcipher_flutter_libs diff --git a/linux/my_application.cc b/linux/my_application.cc index 2406049a..c185bcd7 100644 --- a/linux/my_application.cc +++ b/linux/my_application.cc @@ -61,18 +61,17 @@ static void my_application_activate(GApplication* application) { } gtk_window_set_default_size(window, 864, 680); + gtk_widget_show(GTK_WIDGET(window)); g_autoptr(FlDartProject) project = fl_dart_project_new(); fl_dart_project_set_dart_entrypoint_arguments(project, self->dart_entrypoint_arguments); FlView* view = fl_view_new(project); + gtk_widget_show(GTK_WIDGET(view)); gtk_container_add(GTK_CONTAINER(window), GTK_WIDGET(view)); fl_register_plugins(FL_PLUGIN_REGISTRY(view)); - gtk_widget_show(GTK_WIDGET(window)); - gtk_widget_show(GTK_WIDGET(view)); - gtk_widget_grab_focus(GTK_WIDGET(view)); } diff --git a/pubspec.lock b/pubspec.lock index bde45769..676117cf 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -840,14 +840,6 @@ packages: url: "https://pub.dev" source: hosted version: "1.0.0" - handy_window: - dependency: "direct main" - description: - name: handy_window - sha256: "56b813e58a68b0ee2ab22051400b8b1f1b5cfe88b8cd32288623defb3926245a" - url: "https://pub.dev" - source: hosted - version: "0.4.0" highlighter: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index a8601be1..8e49418e 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -54,7 +54,6 @@ dependencies: future_loading_dialog: ^0.3.0 geolocator: ^7.6.2 go_router: ^13.1.0 - handy_window: ^0.4.0 hive: ^2.2.3 hive_flutter: ^1.1.0 html: ^0.15.4