From 468bdd6cc6f18f5b07a38e82f4b0d1c97acd051d Mon Sep 17 00:00:00 2001
From: RustDesk <71636191+rustdesk@users.noreply.github.com>
Date: Thu, 5 Dec 2024 12:08:58 +0900
Subject: [PATCH] Revert "fix: workaround, linux window, transparent rounded
 corner (#10128)" (#10186)

This reverts commit 8d4c86fe7ff96e38c526c910e8381d697ab66446.
---
 flutter/linux/my_application.cc | 45 ++-------------------------------
 flutter/pubspec.lock            |  2 +-
 2 files changed, 3 insertions(+), 44 deletions(-)

diff --git a/flutter/linux/my_application.cc b/flutter/linux/my_application.cc
index f4247bd94..56b85ccae 100644
--- a/flutter/linux/my_application.cc
+++ b/flutter/linux/my_application.cc
@@ -16,8 +16,6 @@ G_DEFINE_TYPE(MyApplication, my_application, GTK_TYPE_APPLICATION)
 
 extern bool gIsConnectionManager;
 
-GtkWidget *find_gl_area(GtkWidget *widget);
-
 // Implements GApplication::activate.
 static void my_application_activate(GApplication* application) {
   MyApplication* self = MY_APPLICATION(application);
@@ -41,10 +39,9 @@ static void my_application_activate(GApplication* application) {
   // If running on Wayland assume the header bar will work (may need changing
   // if future cases occur).
   gboolean use_header_bar = TRUE;
-  GdkScreen* screen = NULL;
 #ifdef GDK_WINDOWING_X11
-  screen = gtk_window_get_screen(window);
-  if (screen != NULL && GDK_IS_X11_SCREEN(screen)) {
+  GdkScreen* screen = gtk_window_get_screen(window);
+  if (GDK_IS_X11_SCREEN(screen)) {
     const gchar* wm_name = gdk_x11_screen_get_window_manager_name(screen);
     if (g_strcmp0(wm_name, "GNOME Shell") != 0) {
       use_header_bar = FALSE;
@@ -79,22 +76,6 @@ static void my_application_activate(GApplication* application) {
   gtk_widget_show(GTK_WIDGET(view));
   gtk_container_add(GTK_CONTAINER(window), GTK_WIDGET(view));
 
-  // https://github.com/flutter/flutter/issues/152154
-  // Remove this workaround when flutter version is updated.
-  GtkWidget *gl_area = find_gl_area(GTK_WIDGET(view));
-  if (gl_area != NULL) {
-    gtk_gl_area_set_has_alpha(GTK_GL_AREA(gl_area), TRUE);
-  }
-
-  if (screen != NULL) {
-    GdkVisual *visual = NULL;
-    gtk_widget_set_app_paintable(GTK_WIDGET(window), TRUE);
-    visual = gdk_screen_get_rgba_visual(screen);
-    if (visual != NULL && gdk_screen_is_composited(screen)) {
-      gtk_widget_set_visual(GTK_WIDGET(window), visual);
-    }
-  }
-
   fl_register_plugins(FL_PLUGIN_REGISTRY(view));
 
   gtk_widget_grab_focus(GTK_WIDGET(view));
@@ -140,25 +121,3 @@ MyApplication* my_application_new() {
                                      "flags", G_APPLICATION_NON_UNIQUE,
                                      nullptr));
 }
-
-GtkWidget *find_gl_area(GtkWidget *widget)
-{
-  if (GTK_IS_GL_AREA(widget)) {
-    return widget;
-  }
-
-  if (GTK_IS_CONTAINER(widget)) {
-    GList *children = gtk_container_get_children(GTK_CONTAINER(widget));
-    for (GList *iter = children; iter != NULL; iter = g_list_next(iter)) {
-      GtkWidget *child = GTK_WIDGET(iter->data);
-      GtkWidget *gl_area = find_gl_area(child);
-      if (gl_area != NULL) {
-        g_list_free(children);
-        return gl_area;
-      }
-    }
-    g_list_free(children);
-  }
-
-  return NULL;
-}
diff --git a/flutter/pubspec.lock b/flutter/pubspec.lock
index 58df59a55..98f3eef96 100644
--- a/flutter/pubspec.lock
+++ b/flutter/pubspec.lock
@@ -335,7 +335,7 @@ packages:
     description:
       path: "."
       ref: HEAD
-      resolved-ref: "4f562ab49d289cfa36bfda7cff12746ec0200033"
+      resolved-ref: "519350f1f40746798299e94786197d058353bac9"
       url: "https://github.com/rustdesk-org/rustdesk_desktop_multi_window"
     source: git
     version: "0.1.0"