entailz/wry
1
0
Fork 0
forked from wry/wry
Code Pull requests Activity

seat: uniformly convert scroll steps to scroll px

Browse source
This commit is contained in:
Julian Orth 2022-06-05 14:14:53 +02:00
parent 2a9c746781
commit b89d72fcd9
7 changed files with 23 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/tree/container.rs
View file

@ -9,7 +9,7 @@ use {
},
rect::Rect,
render::{Renderer, Texture},
state::{DeviceHandlerData, State},
state::State,
text,
tree::{
walker::NodeVisitor, ContainingNode, Direction, FindTreeResult, FoundNode, Node,
@ -1162,12 +1162,7 @@ impl Node for ContainerNode {
}
}
fn node_on_axis_event(
self: Rc<Self>,
_dev: &DeviceHandlerData,
seat: &Rc<WlSeatGlobal>,
event: &PendingScroll,
) {
fn node_on_axis_event(self: Rc<Self>, seat: &Rc<WlSeatGlobal>, event: &PendingScroll) {
let mut seat_datas = self.seats.borrow_mut();
let seat_data = match seat_datas.get_mut(&seat.id()) {
Some(s) => s,

9
src/tree/output.rs
View file

@ -17,7 +17,7 @@ use {
},
rect::Rect,
render::{Renderer, Texture},
state::{DeviceHandlerData, State},
state::State,
text,
tree::{
walker::NodeVisitor, Direction, FindTreeResult, FoundNode, Node, NodeId, WorkspaceNode,
@ -577,12 +577,7 @@ impl Node for OutputNode {
self.state.tree_changed();
}
fn node_on_axis_event(
self: Rc<Self>,
_dev: &DeviceHandlerData,
seat: &Rc<WlSeatGlobal>,
event: &PendingScroll,
) {
fn node_on_axis_event(self: Rc<Self>, seat: &Rc<WlSeatGlobal>, event: &PendingScroll) {
let steps = match self.scroll.handle(event) {
Some(e) => e,
_ => return,