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

fix(wayland/core): surface role set properly

Browse Source
This commit is contained in:
Nova
2025-09-14 17:08:59 -07:00
parent 795f111ebc
commit 065214c873
3 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/wayland/xdg/surface.rs
View File

@@ -1,5 +1,6 @@
use super::{popup::Popup, positioner::Positioner, toplevel::MappedInner};
use crate::nodes::items::panel::{ChildInfo, SurfaceId};
use crate::wayland::Message;
use crate::wayland::util::ClientExt;
use crate::wayland::{core::surface::SurfaceRole, display::Display, xdg::toplevel::Toplevel};
use std::sync::Arc;
@@ -63,18 +64,23 @@ impl XdgSurface for Surface {
.try_set_role(client, SurfaceRole::XdgToplevel)
.await?;
toplevel.reconfigure(client).await?;
let toplevel_weak = Arc::downgrade(&toplevel);
let display = client.get::<Display>(ObjectId::DISPLAY).unwrap();
let seat = Arc::downgrade(display.seat.get().unwrap());
let pid = display.pid;
let configured = self.configured.clone();
let mut first_commit = true;
let message_tx = client.message_sink().clone();
self.wl_surface.add_commit_handler(move |surface, state| {
let Some(toplevel) = toplevel_weak.upgrade() else {
return true;
};
if first_commit {
let _ = message_tx.send(Message::ReconfigureToplevel(toplevel.clone()));
first_commit = false;
}
let mut mapped_lock = toplevel.mapped.lock();
if mapped_lock.is_none()
&& configured.load(std::sync::atomic::Ordering::SeqCst)