[desktop_drop] Fix not working on Wayland. (MixinNetwork#20)

boyan01 · web-flow · commit 4677289c93bd · 2021-11-10T17:57:08.000+08:00
* add uri targets

* add uri targets

* update readme docs
diff --git a/packages/desktop_drop/.gitignore b/packages/desktop_drop/.gitignore
@@ -8,4 +8,6 @@ build/
 
 .idea
 
-*.iml
+*.iml
+
+pubspec.lock
diff --git a/packages/desktop_drop/CHANGELOG.md b/packages/desktop_drop/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.1.2 (2021/11/10)
+
+[Linux] Fix do not work on Wayland.
+
 ## 0.1.1 (2021/11/8)
 
 update plugin description.
diff --git a/packages/desktop_drop/example/pubspec.lock b/packages/desktop_drop/example/pubspec.lock
@@ -7,7 +7,7 @@ packages:
       name: async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.8.1"
+    version: "2.8.2"
   boolean_selector:
     dependency: transitive
     description:
@@ -21,7 +21,7 @@ packages:
       name: characters
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.0"
+    version: "1.2.0"
   charcode:
     dependency: transitive
     description:
@@ -56,7 +56,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "0.0.1"
+    version: "0.1.1"
   fake_async:
     dependency: transitive
     description:
@@ -94,7 +94,7 @@ packages:
       name: matcher
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.12.10"
+    version: "0.12.11"
   meta:
     dependency: transitive
     description:
@@ -155,7 +155,7 @@ packages:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.4.2"
+    version: "0.4.3"
   typed_data:
     dependency: transitive
     description:
@@ -169,7 +169,7 @@ packages:
       name: vector_math
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.0"
+    version: "2.1.1"
 sdks:
-  dart: ">=2.12.0 <3.0.0"
+  dart: ">=2.14.0 <3.0.0"
   flutter: ">=1.20.0"
diff --git a/packages/desktop_drop/lib/src/channel.dart b/packages/desktop_drop/lib/src/channel.dart
@@ -1,6 +1,5 @@
 import 'dart:convert';
 import 'dart:io';
-import 'dart:ui';
 
 import 'package:flutter/services.dart';
 import 'package:flutter/widgets.dart';
diff --git a/packages/desktop_drop/linux/desktop_drop_plugin.cc b/packages/desktop_drop/linux/desktop_drop_plugin.cc
@@ -49,21 +49,7 @@ void on_drag_leave(GtkWidget *widget, GdkDragContext *drag_context, guint time,
 static void desktop_drop_plugin_handle_method_call(
     DesktopDropPlugin *self,
     FlMethodCall *method_call) {
-  g_autoptr(FlMethodResponse) response = nullptr;
-
-  const gchar *method = fl_method_call_get_name(method_call);
-
-  if (strcmp(method, "getPlatformVersion") == 0) {
-    struct utsname uname_data = {};
-    uname(&uname_data);
-    g_autofree gchar *version = g_strdup_printf("Linux %s", uname_data.version);
-    g_autoptr(FlValue) result = fl_value_new_string(version);
-    response = FL_METHOD_RESPONSE(fl_method_success_response_new(result));
-  } else {
-    response = FL_METHOD_RESPONSE(fl_method_not_implemented_response_new());
-  }
-
-  fl_method_call_respond(method_call, response, nullptr);
+  fl_method_call_respond_not_implemented(method_call, nullptr);
 }
 
 static void desktop_drop_plugin_dispose(GObject *object) {
@@ -91,7 +77,7 @@ void desktop_drop_plugin_register_with_registrar(FlPluginRegistrar *registrar) {
       {strdup("STRING"), GTK_TARGET_OTHER_APP, 0}
   };
   gtk_drag_dest_set(GTK_WIDGET(fl_view), GTK_DEST_DEFAULT_ALL, entries, 1, GDK_ACTION_COPY);
-  gtk_drag_dest_add_text_targets(GTK_WIDGET(fl_view));
+  gtk_drag_dest_add_uri_targets(GTK_WIDGET(fl_view));
 
   g_autoptr(FlStandardMethodCodec) codec = fl_standard_method_codec_new();
   FlMethodChannel *channel =
@@ -109,7 +95,5 @@ void desktop_drop_plugin_register_with_registrar(FlPluginRegistrar *registrar) {
   g_signal_connect(GTK_WIDGET(fl_view), "drag-leave",
                    G_CALLBACK(on_drag_leave), channel);
 
-  std::cout << "channel: " << (void *) channel << std::endl;
-
   g_object_unref(plugin);
 }
diff --git a/packages/desktop_drop/pubspec.lock b/packages/desktop_drop/pubspec.lock
diff --git a/packages/desktop_drop/pubspec.yaml b/packages/desktop_drop/pubspec.yaml
@@ -1,6 +1,6 @@
 name: desktop_drop
 description: A plugin which allows user dragging files to your flutter desktop applications.
-version: 0.1.1
+version: 0.1.2
 homepage: https://github.com/MixinNetwork/flutter-plugins/tree/main/packages/desktop_drop
 
 environment:

-Original file line number
+Diff line change
 .idea
 -*.iml
 +*.iml
++
 +pubspec.lock