leyoda/iced-yoda
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

winit/wayland: Allow Vec for input_zone

Browse source
This commit is contained in:
Ian Douglas Scott 2025-09-18 13:05:18 -07:00 • committed by Ashley Wulber
parent 621713fe15
commit 20e60ffde6
No known key found for this signature in database
GPG key ID: 5216D4F46A90A820
3 changed files with 20 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
runtime/src/platform_specific/wayland/popup.rs
View file

@ -27,7 +27,7 @@ pub struct SctkPopupSettings {
pub close_with_children: bool, pub close_with_children: bool,
/// input zone /// input zone
/// None results in accepting all input /// None results in accepting all input
pub input_zone: Option<Rectangle>, pub input_zone: Option<Vec<Rectangle>>,
} }
impl Hash for SctkPopupSettings { impl Hash for SctkPopupSettings {

2
runtime/src/platform_specific/wayland/subsurface.rs
View file

@ -35,7 +35,7 @@ pub struct SctkSubsurfaceSettings {
/// input zone /// input zone
/// None results in accepting all input /// None results in accepting all input
pub input_zone: Option<Rectangle>, pub input_zone: Option<Vec<Rectangle>>,
} }
impl Hash for SctkSubsurfaceSettings { impl Hash for SctkSubsurfaceSettings {

32
winit/src/platform_specific/wayland/event_loop/state.rs
View file

@ -729,17 +729,19 @@ impl SctkState {
let wl_surface = let wl_surface =
self.compositor_state.create_surface(&self.queue_handle); self.compositor_state.create_surface(&self.queue_handle);
_ = self.id_map.insert(wl_surface.id(), settings.id.clone()); _ = self.id_map.insert(wl_surface.id(), settings.id.clone());
if let Some(z) = settings.input_zone { if let Some(zone) = &settings.input_zone {
let region = self let region = self
.compositor_state .compositor_state
.wl_compositor() .wl_compositor()
.create_region(&self.queue_handle, ()); .create_region(&self.queue_handle, ());
region.add( for rect in zone {
z.x.round() as i32, region.add(
z.y.round() as i32, rect.x.round() as i32,
z.width.round() as i32, rect.y.round() as i32,
z.height.round() as i32, rect.width.round() as i32,
); rect.height.round() as i32,
);
}
wl_surface.set_input_region(Some(&region)); wl_surface.set_input_region(Some(&region));
} }
let (toplevel, popup) = match &parent { let (toplevel, popup) = match &parent {
@ -1684,17 +1686,19 @@ impl SctkState {
); );
wl_subsurface.set_position(bounds.x as i32, bounds.y as i32); wl_subsurface.set_position(bounds.x as i32, bounds.y as i32);
_ = wl_surface.frame(&self.queue_handle, wl_surface.clone()); _ = wl_surface.frame(&self.queue_handle, wl_surface.clone());
if let Some(zone) = settings.input_zone { if let Some(zone) = &settings.input_zone {
let region = self let region = self
.compositor_state .compositor_state
.wl_compositor() .wl_compositor()
.create_region(&self.queue_handle, ()); .create_region(&self.queue_handle, ());
region.add( for rect in zone {
zone.x.round() as i32, region.add(
zone.y.round() as i32, rect.x.round() as i32,
zone.width.round() as i32, rect.y.round() as i32,
zone.height.round() as i32, rect.width.round() as i32,
); rect.height.round() as i32,
);
}
wl_surface.set_input_region(Some(&region)); wl_surface.set_input_region(Some(&region));
region.destroy(); region.destroy();
} }