From c5c3731f2027802735f7b80c7ae5f4b64d0fb746 Mon Sep 17 00:00:00 2001
From: "Ngo Iok Ui (Wu Yu Wei)" <yuweiwu@pm.me>
Date: Mon, 11 Sep 2023 19:38:42 +0900
Subject: [PATCH] Add Linux support for winit feature flag (#1024)

* Add Linux support for winit feature flag

* Fix cargo config

* Revert default to tao

* Update CI to include winit linux

* Fix target
---
 .changes/winit-gtk.md              | 6 ++++++
 .github/workflows/build.yml        | 1 +
 Cargo.toml                         | 4 +++-
 src/webview/webkitgtk/file_drop.rs | 6 ++++--
 4 files changed, 14 insertions(+), 3 deletions(-)
 create mode 100644 .changes/winit-gtk.md

diff --git a/.changes/winit-gtk.md b/.changes/winit-gtk.md
new file mode 100644
index 000000000..03a58d7e3
--- /dev/null
+++ b/.changes/winit-gtk.md
@@ -0,0 +1,6 @@
+---
+"wry": patch
+---
+
+Add winit-gtk to support winit feature flag on Linux.
+
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e771ac591..44fe908d7 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -57,6 +57,7 @@ jobs:
 
       - name: build wry with winit
         if: (
+          contains(matrix.platform.target, 'gnu') ||
           contains(matrix.platform.target, 'windows') ||
           contains(matrix.platform.target, 'apple'))
         run: cargo build --no-default-features --features winit --target ${{ matrix.platform.target }}
diff --git a/Cargo.toml b/Cargo.toml
index 2b82724b1..8bd1d2f45 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -42,7 +42,6 @@ serde_json = "1.0"
 thiserror = "1.0"
 url = "2.4"
 tao = { version = "0.22", default-features = false, features = [ "serde" ], optional = true }
-winit = { version = "0.28", features = [ "serde" ], optional = true }
 http = "0.2.9"
 
 [dev-dependencies]
@@ -58,11 +57,13 @@ glib = "0.16"
 gtk = "0.16"
 gdk = "0.16"
 soup3 = "0.3"
+winit = { package = "winit-gtk", version = "0.28.1", features = [ "serde" ], optional = true }
 
 [target."cfg(target_os = \"windows\")".dependencies]
 webview2-com = "0.25"
 windows-implement = "0.48"
 dunce = "1"
+winit = { version = "0.28", features = [ "serde" ], optional = true }
 
   [target."cfg(target_os = \"windows\")".dependencies.windows]
   version = "0.48"
@@ -90,6 +91,7 @@ cocoa = "0.24"
 core-graphics = "0.22"
 objc = "0.2"
 objc_id = "0.1"
+winit = { version = "0.28", features = [ "serde" ], optional = true }
 
 [target."cfg(target_os = \"android\")".dependencies]
 crossbeam-channel = "0.5"
diff --git a/src/webview/webkitgtk/file_drop.rs b/src/webview/webkitgtk/file_drop.rs
index e0e0af08e..afa963315 100644
--- a/src/webview/webkitgtk/file_drop.rs
+++ b/src/webview/webkitgtk/file_drop.rs
@@ -5,10 +5,12 @@
 use std::{cell::Cell, path::PathBuf, rc::Rc};
 
 use gtk::prelude::*;
-use tao::dpi::LogicalPosition;
 use webkit2gtk::WebView;
 
-use crate::{application::window::Window, webview::FileDropEvent};
+use crate::{
+  application::{dpi::LogicalPosition, window::Window},
+  webview::FileDropEvent,
+};
 
 pub(crate) fn connect_drag_event(
   webview: Rc<WebView>,