Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-09-27 23:30:08 +01:00
Code Issues Projects Releases Packages Wiki Activity

servoshell: Consider window decorations when handling resize requests from web content (#38174)

Browse source 
Also fix some docs. This is used by JS `resizeTo`, `resizeBy` and
webdriver [set window
rect](https://w3c.github.io/webdriver/#set-window-rect).

Testing: Can now pass more tests for headed window.
Fixes: Well.. Originally the attempt is to address
https://github.com/servo/servo/issues/38093#issuecomment-3092284104. But
it turns out as a more general problem to be fixed in another PR.

---------

Signed-off-by: Euclid Ye <euclid.ye@huawei.com>
This commit is contained in:
Euclid Ye 2025-07-24 13:42:04 +08:00 • committed by GitHub
parent f62aa8edc2
commit 0b8986c8da
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 47 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

35
ports/servoshell/desktop/headed_window.rs
View file

@ -91,12 +91,12 @@ impl Window {
event_loop: &ActiveEventLoop,
) -> Window {
let no_native_titlebar = servoshell_preferences.no_native_titlebar;
let window_size = servoshell_preferences.initial_window_size;
let inner_size = servoshell_preferences.initial_window_size;
let window_attr = winit::window::Window::default_attributes()
.with_title("Servo".to_string())
.with_decorations(!no_native_titlebar)
.with_transparent(no_native_titlebar)
.with_inner_size(LogicalSize::new(window_size.width, window_size.height))
.with_inner_size(LogicalSize::new(inner_size.width, inner_size.height))
.with_min_inner_size(LogicalSize::new(1, 1))
// Must be invisible at startup; accesskit_winit setup needs to
// happen before the window is shown for the first time.
@ -430,6 +430,15 @@ impl Window {
}
}
}
/// Update [`WindowRenderingContext`] after a resize.
fn update_window_rendering_context_after_resize(&self, inner_size: PhysicalSize<u32>) {
self.window_rendering_context.resize(PhysicalSize::new(
inner_size.width,
(inner_size.height as f32 - (self.toolbar_height() * self.hidpi_scale_factor()).0)
as u32,
));
}
}
impl WindowPortsMethods for Window {
@ -495,11 +504,11 @@ impl WindowPortsMethods for Window {
new_outer_size.width - decoration_width as i32,
new_outer_size.height - decoration_height as i32,
))
.and_then(|size| {
Some(DeviceIntSize::new(
size.width.try_into().ok()?,
size.height.try_into().ok()?,
))
.map(|resulting_size| {
DeviceIntSize::new(
(resulting_size.width + decoration_width) as i32,
(resulting_size.height + decoration_height) as i32,
)
})
}
@ -678,10 +687,11 @@ impl WindowPortsMethods for Window {
WindowEvent::CloseRequested => {
state.servo().start_shutting_down();
},
WindowEvent::Resized(new_size) => {
if self.inner_size.get() != new_size {
self.window_rendering_context.resize(new_size);
self.inner_size.set(new_size);
WindowEvent::Resized(new_inner_size) => {
if self.inner_size.get() != new_inner_size {
self.inner_size.set(new_inner_size);
// `WebView::move_resize` was already called in `Minibrowser::update`.
self.update_window_rendering_context_after_resize(new_inner_size);
}
},
WindowEvent::ThemeChanged(theme) => {
@ -755,6 +765,9 @@ impl WindowPortsMethods for Window {
}
fn set_toolbar_height(&self, height: Length<f32, DeviceIndependentPixel>) {
if self.toolbar_height() == height {
return;
}
self.toolbar_height.set(height);
// Prevent the inner area from being 0 pixels wide or tall
// this prevents a crash in the compositor due to invalid surface size