x11: Fix window menu not showing (#15328)

Fixes https://github.com/zed-industries/zed/issues/15245#issuecomment-2252790889 Release Notes: - Linux: Fixed window menu not showing on X11

apricotbucket28 committed 2 years ago

Commit 04e25521 parent 3a44a593 files · +23 −14Browse files

Unified · Split

3 files

 }
 /// What window controls this platform supports
-#[derive(Debug, Copy, Clone, Eq, PartialEq, Hash, Default)]
+#[derive(Debug, Copy, Clone, Eq, PartialEq, Hash)]
 pub struct WindowControls {
     /// Whether this platform supports fullscreen
     pub fullscreen: bool,
     pub window_menu: bool,
 }
+impl Default for WindowControls {
+    fn default() -> Self {
+        // Assume that we can do anything, unless told otherwise
+        Self {
+            fullscreen: true,
+            maximize: true,
+            minimize: true,
+            window_menu: true,
+        }
+    }
+}
 /// A type to describe which sides of the window are currently tiled in some way
 #[derive(Debug, Copy, Clone, Eq, PartialEq, Hash, Default)]
 pub struct Tiling {
     }
     fn set_app_id(&mut self, _app_id: &str) {}
     fn window_controls(&self) -> WindowControls {
-        WindowControls {
+        WindowControls::default()
-            fullscreen: true,
-            maximize: true,
-            minimize: true,
-            window_menu: false,
-        }
     }
     fn set_client_inset(&self, _inset: Pixels) {}
     fn gpu_specs(&self) -> Option<GPUSpecs>;

             active: false,
             hovered: false,
             in_progress_window_controls: None,
-            // Assume that we can do anything, unless told otherwise
+            window_controls: WindowControls::default(),
-            window_controls: WindowControls {
-                fullscreen: true,
-                maximize: true,
-                minimize: true,
-                window_menu: true,
-            },
             inset: None,
         })
     }

@@ -1230,6 +1230,14 @@ impl PlatformWindow for X11Window { · 1229 unmodified lines
1230		1230
1231	fn show_window_menu(&self, position: Point<Pixels>) {	1231	fn show_window_menu(&self, position: Point<Pixels>) {
1232	let state = self.0.state.borrow();	1232	let state = self.0.state.borrow();
		1233
		1234	self.0
		1235	.xcb_connection
		1236	.ungrab_pointer(x11rb::CURRENT_TIME)
		1237	.unwrap()
		1238	.check()
		1239	.unwrap();
		1240
1233	let coords = self.get_root_position(position);	1241	let coords = self.get_root_position(position);
1234	let message = ClientMessageEvent::new(	1242	let message = ClientMessageEvent::new(
1235	32,	1243	32,