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

deps: update smithay

Browse source
This commit is contained in:
Victoria Brekenfeld 2022-01-25 15:55:40 +01:00
parent 204edc67e5
commit c0892c625d
5 changed files with 37 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/shell/grabs.rs
View file

@ -9,7 +9,7 @@ use smithay::{
utils::{Logical, Point, Rectangle, Size},
wayland::{
compositor::with_states,
seat::{AxisFrame, GrabStartData, PointerGrab, PointerInnerHandle},
seat::{AxisFrame, PointerGrab, PointerGrabStartData, PointerInnerHandle},
shell::xdg::{SurfaceCachedState, ToplevelConfigure, XdgToplevelSurfaceRoleAttributes},
Serial,
},
@ -22,7 +22,7 @@ struct MoveData {
}
pub struct MoveSurfaceGrab {
start_data: GrabStartData,
start_data: PointerGrabStartData,
window: Window,
initial_window_location: Point<i32, Logical>,
}
@ -70,14 +70,14 @@ impl PointerGrab for MoveSurfaceGrab {
handle.axis(details)
}
fn start_data(&self) -> &GrabStartData {
fn start_data(&self) -> &PointerGrabStartData {
&self.start_data
}
}
impl MoveSurfaceGrab {
pub fn new(
start_data: GrabStartData,
start_data: PointerGrabStartData,
window: Window,
initial_window_location: Point<i32, Logical>,
) -> MoveSurfaceGrab {
@ -159,7 +159,7 @@ impl Default for ResizeState {
}
pub struct ResizeSurfaceGrab {
start_data: GrabStartData,
start_data: PointerGrabStartData,
window: Window,
edges: ResizeEdge,
initial_window_size: Size<i32, Logical>,
@ -290,14 +290,14 @@ impl PointerGrab for ResizeSurfaceGrab {
handle.axis(details)
}
fn start_data(&self) -> &GrabStartData {
fn start_data(&self) -> &PointerGrabStartData {
&self.start_data
}
}
impl ResizeSurfaceGrab {
pub fn new(
start_data: GrabStartData,
start_data: PointerGrabStartData,
window: Window,
edges: xdg_toplevel::ResizeEdge,
initial_window_geometry: Rectangle<i32, Logical>,

4
src/shell/mod.rs
View file

@ -11,7 +11,7 @@ use smithay::{
wayland::{
compositor::{compositor_init, with_states},
output::Output,
seat::{GrabStartData, PointerHandle, Seat},
seat::{PointerGrabStartData, PointerHandle, Seat},
shell::{
wlr_layer::{
wlr_layer_shell_init, LayerShellRequest, LayerShellState, LayerSurfaceAttributes,
@ -262,7 +262,7 @@ fn check_grab_preconditions(
seat: &Seat,
surface: Option<&WlSurface>,
serial: Serial,
) -> Option<(PointerHandle, GrabStartData)> {
) -> Option<(PointerHandle, PointerGrabStartData)> {
let surface = if let Some(surface) = surface {
surface
} else {