chore: update smithay
This commit is contained in:
parent
650768211f
commit
ccc4f36065
16 changed files with 513 additions and 552 deletions
|
|
@ -47,8 +47,8 @@ use smithay::{
|
|||
GestureSwipeUpdateEvent, MotionEvent, PointerTarget, RelativeMotionEvent,
|
||||
},
|
||||
touch::{
|
||||
DownEvent, MotionEvent as TouchMotionEvent, OrientationEvent, ShapeEvent, TouchTarget,
|
||||
UpEvent,
|
||||
DownEvent, FrameMarker, MotionEvent as TouchMotionEvent, OrientationEvent, ShapeEvent,
|
||||
TouchTarget, UpEvent,
|
||||
},
|
||||
},
|
||||
output::Output,
|
||||
|
|
@ -1190,43 +1190,42 @@ impl PointerTarget<State> for CosmicWindow {
|
|||
}
|
||||
|
||||
impl TouchTarget<State> for CosmicWindow {
|
||||
fn down(&self, seat: &Seat<State>, data: &mut State, event: &DownEvent, seq: Serial) {
|
||||
fn down(&self, seat: &Seat<State>, data: &mut State, event: &DownEvent) {
|
||||
let mut event = event.clone();
|
||||
self.0.with_program(|p| {
|
||||
event.location -= p.window.geometry().loc.to_f64();
|
||||
});
|
||||
TouchTarget::down(&self.0, seat, data, &event, seq)
|
||||
TouchTarget::down(&self.0, seat, data, &event)
|
||||
}
|
||||
|
||||
fn up(&self, seat: &Seat<State>, data: &mut State, event: &UpEvent, seq: Serial) {
|
||||
TouchTarget::up(&self.0, seat, data, event, seq)
|
||||
fn up(&self, seat: &Seat<State>, data: &mut State, event: &UpEvent) {
|
||||
TouchTarget::up(&self.0, seat, data, event)
|
||||
}
|
||||
|
||||
fn motion(&self, seat: &Seat<State>, data: &mut State, event: &TouchMotionEvent, seq: Serial) {
|
||||
fn motion(&self, seat: &Seat<State>, data: &mut State, event: &TouchMotionEvent) {
|
||||
let mut event = event.clone();
|
||||
event.location -= self.0.with_program(|p| p.window.geometry().loc.to_f64());
|
||||
TouchTarget::motion(&self.0, seat, data, &event, seq)
|
||||
TouchTarget::motion(&self.0, seat, data, &event)
|
||||
}
|
||||
|
||||
fn frame(&self, seat: &Seat<State>, data: &mut State, seq: Serial) {
|
||||
TouchTarget::frame(&self.0, seat, data, seq)
|
||||
fn frame(&self, seat: &Seat<State>, data: &mut State, frame: FrameMarker) {
|
||||
TouchTarget::frame(&self.0, seat, data, frame)
|
||||
}
|
||||
|
||||
fn cancel(&self, seat: &Seat<State>, data: &mut State, seq: Serial) {
|
||||
TouchTarget::cancel(&self.0, seat, data, seq)
|
||||
fn cancel(&self, seat: &Seat<State>, data: &mut State, frame: FrameMarker) {
|
||||
TouchTarget::cancel(&self.0, seat, data, frame)
|
||||
}
|
||||
|
||||
fn shape(&self, seat: &Seat<State>, data: &mut State, event: &ShapeEvent, seq: Serial) {
|
||||
TouchTarget::shape(&self.0, seat, data, event, seq)
|
||||
fn shape(&self, seat: &Seat<State>, data: &mut State, event: &ShapeEvent) {
|
||||
TouchTarget::shape(&self.0, seat, data, event)
|
||||
}
|
||||
|
||||
fn orientation(
|
||||
&self,
|
||||
_seat: &Seat<State>,
|
||||
_data: &mut State,
|
||||
_event: &OrientationEvent,
|
||||
_seq: Serial,
|
||||
) {
|
||||
fn orientation(&self, seat: &Seat<State>, data: &mut State, event: &OrientationEvent) {
|
||||
TouchTarget::orientation(&self.0, seat, data, event)
|
||||
}
|
||||
|
||||
fn last_frame(&self, seat: &Seat<State>, data: &mut State) -> Option<FrameMarker> {
|
||||
TouchTarget::last_frame(&self.0, seat, data)
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue