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

deps: smithay + egui update

Browse source
This commit is contained in:
Victoria Brekenfeld 2022-11-17 20:32:54 +01:00
parent aa3ee245d1
commit 7a034c8e52
20 changed files with 906 additions and 657 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/utils/prelude.rs
View file

@ -1,4 +1,4 @@
use std::{cell::RefCell, sync::Mutex};
use std::{cell::RefCell, sync::Mutex, time::Duration};
use crate::{
backend::render::cursor::CursorState,
@ -11,7 +11,7 @@ use smithay::{
Seat,
},
output::Output,
utils::{Buffer, IsAlive, Logical, Point, Rectangle, Transform},
utils::{Buffer, IsAlive, Logical, Monotonic, Point, Rectangle, Time, Transform},
wayland::compositor::with_states,
};
@ -47,7 +47,7 @@ pub trait SeatExt {
fn cursor_geometry(
&self,
loc: impl Into<Point<f64, Buffer>>,
start_time: &std::time::Instant,
time: Time<Monotonic>,
) -> Option<(Rectangle<i32, Buffer>, Point<i32, Buffer>)>;
}
@ -75,7 +75,7 @@ impl SeatExt for Seat<State> {
fn cursor_geometry(
&self,
loc: impl Into<Point<f64, Buffer>>,
start_time: &std::time::Instant,
time: Time<Monotonic>,
) -> Option<(Rectangle<i32, Buffer>, Point<i32, Buffer>)> {
let location = loc.into().to_i32_round();
@ -117,7 +117,7 @@ impl SeatExt for Seat<State> {
let state = seat_userdata.get::<CursorState>().unwrap();
let frame = state
.cursor
.get_image(1, start_time.elapsed().as_millis() as u32);
.get_image(1, Into::<Duration>::into(time).as_millis() as u32);
Some((
Rectangle::from_loc_and_size(