entailz/wry
1
0
Fork 0
forked from wry/wry
Code Pull requests Activity

xdg-shell: make acked serial part of the pending state

Browse source
This commit is contained in:
Julian Orth 2025-09-19 12:27:42 +02:00
parent c9f54cd60b
commit 17ac4ca0e1
7 changed files with 85 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/ifs/wl_surface/xdg_surface/xdg_popup.rs
View file

@ -7,7 +7,7 @@ use {
wl_seat::{NodeSeatState, WlSeatGlobal, tablet::TabletTool},
wl_surface::{
tray::TrayItemId,
xdg_surface::{XdgSurface, XdgSurfaceError, XdgSurfaceExt},
xdg_surface::{XdgSurface, XdgSurfaceExt},
},
xdg_positioner::{
CA_FLIP_X, CA_FLIP_Y, CA_RESIZE_X, CA_RESIZE_Y, CA_SLIDE_X, CA_SLIDE_Y,
@ -417,13 +417,12 @@ impl StackedNode for XdgPopup {
}
impl XdgSurfaceExt for XdgPopup {
fn initial_configure(self: Rc<Self>) -> Result<(), XdgSurfaceError> {
fn initial_configure(self: Rc<Self>) {
if let Some(parent) = self.parent.get() {
self.update_position(&*parent);
let rel = self.relative_position.get();
self.send_configure(rel.x1(), rel.y1(), rel.width(), rel.height());
}
Ok(())
}
fn post_commit(self: Rc<Self>) {

6
src/ifs/wl_surface/xdg_surface/xdg_toplevel.rs
View file

@ -13,8 +13,7 @@ use {
wl_surface::{
WlSurface,
xdg_surface::{
XdgSurface, XdgSurfaceError, XdgSurfaceExt,
xdg_toplevel::xdg_dialog_v1::XdgDialogV1,
XdgSurface, XdgSurfaceExt, xdg_toplevel::xdg_dialog_v1::XdgDialogV1,
},
},
xdg_toplevel_drag_v1::XdgToplevelDragV1,
@ -753,14 +752,13 @@ impl ToplevelNodeBase for XdgToplevel {
}
impl XdgSurfaceExt for XdgToplevel {
fn initial_configure(self: Rc<Self>) -> Result<(), XdgSurfaceError> {
fn initial_configure(self: Rc<Self>) {
let rect = self.xdg.absolute_desired_extents.get();
if rect.is_empty() {
self.send_configure(0, 0);
} else {
self.send_configure_checked(rect.width(), rect.height());
}
Ok(())
}
fn post_commit(self: Rc<Self>) {