StardustXR/server
1
0
Fork 0
Code Issues 11 Pull Requests 3 Actions Packages Projects Releases 5 Wiki Activity

fix(wayland/xdg_shell): proper versioning

Browse Source
This commit is contained in:
Nova
2025-08-11 18:22:45 -07:00
parent 5383bbedcd
commit 565cb29b85
4 changed files with 31 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/wayland/xdg/popup.rs
View File

@@ -17,6 +17,7 @@ use waynest::{
#[derive(Debug, Dispatcher)]
pub struct Popup {
id: ObjectId,
version: u32,
parent: Weak<Surface>,
surface: Weak<Surface>,
pub panel_item: Weak<PanelItem<XdgBackend>>,
@@ -27,6 +28,7 @@ pub struct Popup {
impl Popup {
pub fn new(
id: ObjectId,
version: u32,
parent: &Arc<Surface>,
panel_item: &Arc<PanelItem<XdgBackend>>,
xdg_surface: &Arc<Surface>,
@@ -35,6 +37,7 @@ impl Popup {
let positioner_data = positioner.data();
Self {
id,
version,
parent: Arc::downgrade(parent),
surface: Arc::downgrade(xdg_surface),
panel_item: Arc::downgrade(panel_item),
@@ -67,7 +70,9 @@ impl XdgPopup for Popup {
let positioner = client.get::<Positioner>(positioner).unwrap();
let positioner_data = positioner.data();
*self.positioner_data.lock() = positioner_data;
self.repositioned(client, sender_id, token).await?;
if self.version >= 5 {
self.repositioned(client, sender_id, token).await?;
}
let geometry = positioner_data.infinite_geometry();
self.configure(
client,