Fix #3107 too

canonical · Nov 21, 2023 · bc3b831 · bc3b831
1 parent a2de6af
commit bc3b831
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/server/frontend_xwayland/xwayland_surface.cpp b/src/server/frontend_xwayland/xwayland_surface.cpp
@@ -210,11 +210,14 @@ auto wm_window_type_to_mir_window_type(
         }
         else if (wm_type == connection->_NET_WM_WINDOW_TYPE_POPUP_MENU ||
                  wm_type == connection->_NET_WM_WINDOW_TYPE_DROPDOWN_MENU ||
-                 wm_type == connection->_NET_WM_WINDOW_TYPE_COMBO ||
-                 wm_type == connection->_NET_WM_WINDOW_TYPE_DIALOG)
+                 wm_type == connection->_NET_WM_WINDOW_TYPE_COMBO)
         {
             return mir_window_type_menu;
         }
+        else if (wm_type == connection->_NET_WM_WINDOW_TYPE_DIALOG)
+        {
+            return override_redirect ? mir_window_type_menu : mir_window_type_dialog;
+        }
         else if (wm_type == connection->_NET_WM_WINDOW_TYPE_TOOLTIP ||
                  wm_type == connection->_NET_WM_WINDOW_TYPE_NOTIFICATION ||
                  wm_type == connection->_NET_WM_WINDOW_TYPE_DND)