From 6349afae2beebabf696ec9815f9bc8bfb954e8d9 Mon Sep 17 00:00:00 2001
From: krille-chan <christian-kussowski@posteo.de>
Date: Sun, 7 Apr 2024 14:31:51 +0200
Subject: [PATCH] build: Use libhandy for linux desktop again

---
 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, 17 insertions(+), 2 deletions(-)

diff --git a/linux/flutter/generated_plugin_registrant.cc b/linux/flutter/generated_plugin_registrant.cc
index 18e739cdd..b5155de25 100644
--- a/linux/flutter/generated_plugin_registrant.cc
+++ b/linux/flutter/generated_plugin_registrant.cc
@@ -12,6 +12,7 @@
 #include <file_selector_linux/file_selector_plugin.h>
 #include <flutter_secure_storage_linux/flutter_secure_storage_linux_plugin.h>
 #include <flutter_webrtc/flutter_web_r_t_c_plugin.h>
+#include <handy_window/handy_window_plugin.h>
 #include <pasteboard/pasteboard_plugin.h>
 #include <record_linux/record_linux_plugin.h>
 #include <sqlcipher_flutter_libs/sqlite3_flutter_libs_plugin.h>
@@ -37,6 +38,9 @@ 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 b4a43e1b9..dab6fedfc 100644
--- a/linux/flutter/generated_plugins.cmake
+++ b/linux/flutter/generated_plugins.cmake
@@ -9,6 +9,7 @@ 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 c185bcd78..2406049a9 100644
--- a/linux/my_application.cc
+++ b/linux/my_application.cc
@@ -61,17 +61,18 @@ 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 676117cf5..bde45769d 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -840,6 +840,14 @@ 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 8e49418ec..a8601be18 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -54,6 +54,7 @@ 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