bhrebec/xwayland-satellite
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tests: reposition_window to reconfigure_window

Browse source 
Also added an `override_redirect` parameter to make the reconfigure
function more versatile.
This commit is contained in:
En-En 2025-12-01 01:57:30 +00:00 • committed by Supreeeme
parent 4fb968b1f7
commit 97bba1d2a9
1 changed files with 19 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

46
src/server/tests.rs
View file

@ -889,7 +889,7 @@ impl TestFixture<FakeXConnection> {
} }
} }
fn reposition_window(&mut self, window: Window, dims: WindowDims) { fn reconfigure_window(&mut self, window: Window, dims: WindowDims, override_redirect: bool) {
self.satellite self.satellite
.reconfigure_window(x::ConfigureNotifyEvent::new( .reconfigure_window(x::ConfigureNotifyEvent::new(
window, window,
@ -900,7 +900,7 @@ impl TestFixture<FakeXConnection> {
dims.width, dims.width,
dims.height, dims.height,
0, 0,
true, override_redirect,
)); ));
} }
} }
@ -1725,7 +1725,7 @@ fn reconfigure_popup() {
width: 80, width: 80,
height: 100, height: 100,
}; };
f.reposition_window(popup, new_dims); f.reconfigure_window(popup, new_dims, true);
f.run(); f.run();
f.run(); f.run();
f.assert_window_dimensions(popup, p_id, new_dims); f.assert_window_dimensions(popup, p_id, new_dims);
@ -1759,7 +1759,7 @@ fn reconfigure_popup_after_map() {
}; };
f.new_window(popup, true, popup_data); f.new_window(popup, true, popup_data);
f.satellite.map_window(popup); f.satellite.map_window(popup);
f.reposition_window(popup, new_dims); f.reconfigure_window(popup, new_dims, true);
f.associate_window(&comp, popup, &surface); f.associate_window(&comp, popup, &surface);
f.run(); f.run();
surface surface
@ -1796,7 +1796,7 @@ fn reconfigure_toplevel() {
// A toplevel can be resized, but not change position // A toplevel can be resized, but not change position
dims.x = 20; dims.x = 20;
dims.y = 20; dims.y = 20;
f.reposition_window(toplevel, dims); f.reconfigure_window(toplevel, dims, false);
f.run(); f.run();
f.run(); f.run();
@ -2270,17 +2270,13 @@ fn fractional_scale_small_popup() {
let pos = &data.popup().positioner_state; let pos = &data.popup().positioner_state;
assert_eq!(pos.size.unwrap(), testwl::Vec2 { x: 1, y: 1 }); assert_eq!(pos.size.unwrap(), testwl::Vec2 { x: 1, y: 1 });
f.satellite.reconfigure_window(x::ConfigureNotifyEvent::new( let dims = WindowDims {
popup, x: 0,
popup, y: 0,
x::WINDOW_NONE, width: 2,
0, height: 1,
0, };
2, f.reconfigure_window(popup, dims, true);
1,
0,
true,
));
f.run(); f.run();
f.run(); f.run();
@ -2837,17 +2833,13 @@ fn resize_decorations_on_reconfigure() {
data.role data.role
); );
f.satellite.reconfigure_window(x::ConfigureNotifyEvent::new( let dims = WindowDims {
window, x: 0,
window, y: 0,
x::WINDOW_NONE, width: 200,
0, height: 200,
0, };
200, f.reconfigure_window(window, dims, false);
200,
0,
false,
));
f.run(); f.run();
f.run(); f.run();