language-servers/slint
1
0
Fork 0
mirror of https://github.com/slint-ui/slint.git synced 2025-10-01 22:31:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

GL backend cleanup

Browse source 
Move the window constraint application handling into WinitWindow,
for future sharing.
This commit is contained in:
Simon Hausmann 2021-11-10 16:06:28 +01:00
parent 8de52f1b70
commit 68ec3ccf6f
2 changed files with 84 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

64
sixtyfps_runtime/rendering_backends/gl/event_loop.rs
View file

@ -32,6 +32,70 @@ pub trait WinitWindow: PlatformWindow {
fn currently_pressed_key_code(&self) -> &Cell<Option<winit::event::VirtualKeyCode>>;
fn current_keyboard_modifiers(&self) -> &Cell<KeyboardModifiers>;
fn draw(self: Rc<Self>);
fn with_window_handle(&self, callback: &dyn Fn(&winit::window::Window));
fn constraints(&self) -> (corelib::layout::LayoutInfo, corelib::layout::LayoutInfo);
fn set_constraints(
&self,
constraints: (corelib::layout::LayoutInfo, corelib::layout::LayoutInfo),
);
fn apply_constraints(
&self,
constraints_horizontal: corelib::layout::LayoutInfo,
constraints_vertical: corelib::layout::LayoutInfo,
) {
self.with_window_handle(&|winit_window| {
// If we're in fullscreen state, don't try to resize the window but maintain the surface
// size we've been assigned to from the windowing system. Weston/Wayland don't like it
// when we create a surface that's bigger than the screen due to constraints (#532).
if winit_window.fullscreen().is_some() {
return;
}
if (constraints_horizontal, constraints_vertical) != self.constraints() {
let min_width = constraints_horizontal.min.min(constraints_horizontal.max);
let min_height = constraints_vertical.min.min(constraints_vertical.max);
let max_width = constraints_horizontal.max.max(constraints_horizontal.min);
let max_height = constraints_vertical.max.max(constraints_vertical.min);
winit_window.set_min_inner_size(if min_width > 0. || min_height > 0. {
Some(winit::dpi::LogicalSize::new(min_width, min_height))
} else {
None
});
winit_window.set_max_inner_size(if max_width < f32::MAX || max_height < f32::MAX {
Some(winit::dpi::LogicalSize::new(
max_width.min(65535.),
max_height.min(65535.),
))
} else {
None
});
self.set_constraints((constraints_horizontal, constraints_vertical));
#[cfg(target_arch = "wasm32")]
{
// set_max_inner_size / set_min_inner_size don't work on wasm, so apply the size manually
let existing_size = winit_window.inner_size();
if !(min_width..=max_width).contains(&(existing_size.width as f32))
|| !(min_height..=max_height).contains(&(existing_size.height as f32))
{
let new_size = winit::dpi::LogicalSize::new(
existing_size
.width
.min(max_width.ceil() as u32)
.max(min_width.ceil() as u32),
existing_size
.height
.min(max_height.ceil() as u32)
.max(min_height.ceil() as u32),
);
winit_window.set_inner_size(new_size);
}
}
}
});
}
}
struct NotRunningEventLoop {

72
sixtyfps_runtime/rendering_backends/gl/glwindow.rs
View file

@ -191,6 +191,25 @@ impl WinitWindow for GLWindow {
window.opengl_context.make_not_current();
});
}
fn with_window_handle(&self, callback: &dyn Fn(&winit::window::Window)) {
if let Some(mapped_window) = self.borrow_mapped_window() {
callback(&*mapped_window.opengl_context.window())
}
}
fn constraints(&self) -> (corelib::layout::LayoutInfo, corelib::layout::LayoutInfo) {
self.borrow_mapped_window().map(|window| window.constraints.get()).unwrap_or_default()
}
fn set_constraints(
&self,
constraints: (corelib::layout::LayoutInfo, corelib::layout::LayoutInfo),
) {
if let Some(window) = self.borrow_mapped_window() {
window.constraints.set(constraints);
}
}
}
impl PlatformWindow for GLWindow {
@ -341,58 +360,7 @@ impl PlatformWindow for GLWindow {
constraints_horizontal: corelib::layout::LayoutInfo,
constraints_vertical: corelib::layout::LayoutInfo,
) {
if let Some(window) = self.borrow_mapped_window() {
let winit_window = window.opengl_context.window();
// If we're in fullscreen state, don't try to resize the window but maintain the surface
// size we've been assigned to from the windowing system. Weston/Wayland don't like it
// when we create a surface that's bigger than the screen due to constraints (#532).
if winit_window.fullscreen().is_some() {
return;
}
if (constraints_horizontal, constraints_vertical) != window.constraints.get() {
let min_width = constraints_horizontal.min.min(constraints_horizontal.max);
let min_height = constraints_vertical.min.min(constraints_vertical.max);
let max_width = constraints_horizontal.max.max(constraints_horizontal.min);
let max_height = constraints_vertical.max.max(constraints_vertical.min);
winit_window.set_min_inner_size(if min_width > 0. || min_height > 0. {
Some(winit::dpi::LogicalSize::new(min_width, min_height))
} else {
None
});
winit_window.set_max_inner_size(if max_width < f32::MAX || max_height < f32::MAX {
Some(winit::dpi::LogicalSize::new(
max_width.min(65535.),
max_height.min(65535.),
))
} else {
None
});
window.constraints.set((constraints_horizontal, constraints_vertical));
#[cfg(target_arch = "wasm32")]
{
// set_max_inner_size / set_min_inner_size don't work on wasm, so apply the size manually
let existing_size = window.opengl_context.window().inner_size();
if !(min_width..=max_width).contains(&(existing_size.width as f32))
|| !(min_height..=max_height).contains(&(existing_size.height as f32))
{
let new_size = winit::dpi::LogicalSize::new(
existing_size
.width
.min(max_width.ceil() as u32)
.max(min_width.ceil() as u32),
existing_size
.height
.min(max_height.ceil() as u32)
.max(min_height.ceil() as u32),
);
window.opengl_context.window().set_inner_size(new_size);
}
}
}
}
self.apply_constraints(constraints_horizontal, constraints_vertical)
}
fn show(self: Rc<Self>) {