vtimofei
/
smithay
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

anvil.shell: store geometry in SurfaceData

This commit is contained in:
Ivan Molodetskikh 2020-02-03 16:22:48 +03:00
parent ebb3a05502
commit 9fd9db82ae
No known key found for this signature in database
GPG Key ID: 02CE38DA47E9D691
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
anvil/src/shell.rs
View File

@ -270,6 +270,7 @@ pub struct SurfaceData {
pub buffer: Option<wl_buffer::WlBuffer>, pub buffer: Option<wl_buffer::WlBuffer>,
pub texture: Option<crate::glium_drawer::TextureMetadata>, pub texture: Option<crate::glium_drawer::TextureMetadata>,
pub dimensions: Option<(i32, i32)>, pub dimensions: Option<(i32, i32)>,
pub geometry: Option<Rectangle>,
pub input_region: Option<RegionAttributes>, pub input_region: Option<RegionAttributes>,
} }
@ -315,10 +316,15 @@ fn surface_commit(
token: CompositorToken<Roles>, token: CompositorToken<Roles>,
buffer_utils: &BufferUtils, buffer_utils: &BufferUtils,
) { ) {
let geometry = token
.with_role_data(surface, |role: &mut XdgSurfaceRole| role.window_geometry)
.unwrap_or(None);
token.with_surface_data(surface, |attributes| { token.with_surface_data(surface, |attributes| {
attributes.user_data.insert_if_missing(SurfaceData::default); attributes.user_data.insert_if_missing(SurfaceData::default);
let data = attributes.user_data.get_mut::<SurfaceData>().unwrap(); let data = attributes.user_data.get_mut::<SurfaceData>().unwrap();
data.geometry = geometry;
data.input_region = attributes.input_region.clone(); data.input_region = attributes.input_region.clone();
// we retrieve the contents of the associated buffer and copy it // we retrieve the contents of the associated buffer and copy it