From 56cffa155b20eaeb5b3a5f3ad434493d700a43a6 Mon Sep 17 00:00:00 2001
From: Ivan Molodetskikh <yalterz@gmail.com>
Date: Sat, 30 Sep 2023 09:05:16 +0400
Subject: Update Smithay

---
 src/handlers/xdg_shell.rs | 33 +++++++++++++++++++--------------
 1 file changed, 19 insertions(+), 14 deletions(-)

(limited to 'src')

diff --git a/src/handlers/xdg_shell.rs b/src/handlers/xdg_shell.rs
index 38fe3c9a..e8cee1b5 100644
--- a/src/handlers/xdg_shell.rs
+++ b/src/handlers/xdg_shell.rs
@@ -241,20 +241,25 @@ impl State {
         self.niri.popups.commit(surface);
 
         if let Some(popup) = self.niri.popups.find_popup(surface) {
-            let PopupKind::Xdg(ref popup) = popup;
-            let initial_configure_sent = with_states(surface, |states| {
-                states
-                    .data_map
-                    .get::<XdgPopupSurfaceData>()
-                    .unwrap()
-                    .lock()
-                    .unwrap()
-                    .initial_configure_sent
-            });
-            if !initial_configure_sent {
-                // NOTE: This should never fail as the initial configure is always
-                // allowed.
-                popup.send_configure().expect("initial configure failed");
+            match popup {
+                PopupKind::Xdg(ref popup) => {
+                    let initial_configure_sent = with_states(surface, |states| {
+                        states
+                            .data_map
+                            .get::<XdgPopupSurfaceData>()
+                            .unwrap()
+                            .lock()
+                            .unwrap()
+                            .initial_configure_sent
+                    });
+                    if !initial_configure_sent {
+                        // NOTE: This should never fail as the initial configure is always
+                        // allowed.
+                        popup.send_configure().expect("initial configure failed");
+                    }
+                }
+                // Input method popups don't require a configure.
+                PopupKind::InputMethod(_) => (),
             }
         }
     }
-- 
cgit