Merge pull request #552 from vyivel/layer-surface-destruction-order

Destroy zwlr_layer_surface_v1 before wl_surface
rcaelers · Jun 26, 2024 · 3ae0342 · 3ae0342
2 parents 6c237ec + b7bc20a
commit 3ae0342
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/ui/app/toolkits/gtkmm/BreakWindow.cc b/ui/app/toolkits/gtkmm/BreakWindow.cc
@@ -762,15 +762,15 @@ BreakWindow::stop()
       frame->set_frame_flashing(0);
     }
 
-  hide();
-
 #if defined(HAVE_WAYLAND)
   if (window_manager)
     {
       window_manager->clear_surfaces();
     }
 #endif
 
+  hide();
+
 #if defined(PLATFORM_OS_WINDOWS)
   if (desktop_window != nullptr)
     {

diff --git a/ui/app/toolkits/gtkmm/platforms/unix/WaylandWindowManager.cc b/ui/app/toolkits/gtkmm/platforms/unix/WaylandWindowManager.cc
@@ -162,6 +162,10 @@ LayerSurface::LayerSurface(struct zwlr_layer_shell_v1 *layer_shell,
   wl_display_roundtrip(display);
 }
 
+LayerSurface::~LayerSurface() {
+  zwlr_layer_surface_v1_destroy(this->layer_surface);
+}
+
 void
 LayerSurface::layer_surface_configure(void *data,
                                       struct zwlr_layer_surface_v1 *surface,

diff --git a/ui/app/toolkits/gtkmm/platforms/unix/WaylandWindowManager.hh b/ui/app/toolkits/gtkmm/platforms/unix/WaylandWindowManager.hh
@@ -30,7 +30,7 @@ class LayerSurface
 {
 public:
   LayerSurface(struct zwlr_layer_shell_v1 *layer_shell, Gtk::Widget &window, Glib::RefPtr<Gdk::Monitor> monitor, bool keyboard_focus);
-  ~LayerSurface() = default;
+  ~LayerSurface();
 
 private:
   static void layer_surface_configure(void *data,