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

input: Update for newest smithay master

Browse source
This commit is contained in:
Victoria Brekenfeld 2022-04-26 18:56:17 +02:00
parent 4ecc043cab
commit 8eff406a4f
2 changed files with 10 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/input/mod.rs
View file

@ -546,18 +546,10 @@ impl State {
) )
.map(|(s, _)| s); .map(|(s, _)| s);
} }
} else if let Some(window) = } else if let Some((_, surface, _)) =
workspace.space.window_under(relative_pos).cloned() workspace.space.surface_under(relative_pos, WindowSurfaceType::TOPLEVEL | WindowSurfaceType::SUBSURFACE)
{ {
let window_loc = under = Some(surface);
workspace.space.window_location(&window).unwrap();
under = window
.surface_under(
relative_pos - window_loc.to_f64(),
WindowSurfaceType::TOPLEVEL
| WindowSurfaceType::SUBSURFACE,
)
.map(|(s, _)| s);
} else if let Some(layer) = layers } else if let Some(layer) = layers
.layer_under(WlrLayer::Bottom, pos) .layer_under(WlrLayer::Bottom, pos)
.or_else(|| layers.layer_under(WlrLayer::Background, pos)) .or_else(|| layers.layer_under(WlrLayer::Background, pos))
@ -726,16 +718,11 @@ impl State {
WindowSurfaceType::ALL, WindowSurfaceType::ALL,
) )
.map(|(s, loc)| (s, loc + layer_loc + output_geo.loc)) .map(|(s, loc)| (s, loc + layer_loc + output_geo.loc))
} else if let Some(window) = workspace.space.window_under(relative_pos) { } else if let Some((_, surface, loc)) = workspace.space.surface_under(relative_pos, WindowSurfaceType::ALL) {
let window_loc = workspace.space.window_location(window).unwrap(); Some((
window surface,
.surface_under(relative_pos - window_loc.to_f64(), WindowSurfaceType::ALL) loc + (global_pos - relative_pos).to_i32_round(),
.map(|(s, loc)| { ))
(
s,
loc + window_loc - (relative_pos - global_pos).to_i32_round(),
)
})
} else if let Some(layer) = layers } else if let Some(layer) = layers
.layer_under(WlrLayer::Bottom, relative_pos) .layer_under(WlrLayer::Bottom, relative_pos)
.or_else(|| layers.layer_under(WlrLayer::Background, relative_pos)) .or_else(|| layers.layer_under(WlrLayer::Background, relative_pos))

5
src/shell/layout/tiling/mod.rs
View file

@ -547,12 +547,11 @@ impl TilingLayout {
xdg.send_configure(); xdg.send_configure();
} }
} }
let window_geo = window.geometry();
space.map_window( space.map_window(
&window, &window,
( (
geo.loc.x + inner - window_geo.loc.x, geo.loc.x + inner,
geo.loc.y + inner - window_geo.loc.y, geo.loc.y + inner,
), ),
false, false,
); );