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

refactor: apply requested size for surface after creation

Browse source 
This should help popups start as the correct size, and also layer surfaces
This commit is contained in:
Ashley Wulber 2024-10-23 18:33:45 -04:00
parent cb529219ab
commit 9668fd9821
No known key found for this signature in database
GPG key ID: 5216D4F46A90A820
3 changed files with 130 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

2
examples/todos/Cargo.toml
View file

@ -10,7 +10,7 @@ tester = ["iced/tester"]
[dependencies] [dependencies]
iced.workspace = true iced.workspace = true
iced.features = ["tokio", "debug", "time-travel", "winit", "wgpu"] iced.features = ["tokio", "debug", "time-travel", "winit"]
serde = { version = "1.0", features = ["derive"] } serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0" serde_json = "1.0"

4
winit/src/platform_specific/wayland/event_loop/mod.rs
View file

@ -18,9 +18,7 @@ use crate::{
}; };
use raw_window_handle::HasDisplayHandle; use raw_window_handle::HasDisplayHandle;
use sctk::reexports::{ use sctk::reexports::calloop_wayland_source::WaylandSource;
calloop_wayland_source::WaylandSource, client::protocol::wl_subcompositor,
};
use sctk::{ use sctk::{
activation::ActivationState, activation::ActivationState,
compositor::CompositorState, compositor::CompositorState,

154
winit/src/platform_specific/wayland/sctk_event.rs
View file

@ -748,19 +748,66 @@ impl SctkEvent {
); );
} }
let _ = user_interfaces.insert( let mut ui = crate::program::build_user_interface(
program,
user_interface::Cache::default(),
&mut window.renderer,
logical_size,
debug,
surface_id, surface_id,
crate::build_user_interface( window.raw.clone(),
program, window.prev_dnd_destination_rectangles_count,
user_interface::Cache::default(), clipboard,
&mut window.renderer,
logical_size,
surface_id,
window.raw.clone(),
window.prev_dnd_destination_rectangles_count,
clipboard,
),
); );
_ = ui.update(
&vec![iced_runtime::core::Event::PlatformSpecific(
iced_runtime::core::event::PlatformSpecific::Wayland(
iced_runtime::core::event::wayland::Event::RequestResize,
),
)],
window.state.cursor(),
&mut window.renderer,
clipboard,
&mut Vec::new(),
);
if let Some(requested_size) =
clipboard.requested_logical_size.lock().unwrap().take()
{
let requested_physical_size =
winit::dpi::PhysicalSize::new(
(requested_size.width as f64
* window.state.scale_factor())
.ceil() as u32,
(requested_size.height as f64
* window.state.scale_factor())
.ceil() as u32,
);
let physical_size = window.state.physical_size();
if requested_physical_size.width != physical_size.width
|| requested_physical_size.height
!= physical_size.height
{
// FIXME what to do when we are stuck in a configure event/resize request loop
// We don't have control over how winit handles this.
window.resize_enabled = true;
let s = winit::dpi::Size::Physical(
requested_physical_size,
);
_ = window.raw.request_surface_size(s);
window.raw.set_min_surface_size(Some(s));
window.raw.set_max_surface_size(Some(s));
window.state.synchronize(
&program,
surface_id,
window.raw.as_ref(),
);
}
}
let _ = user_interfaces.insert(surface_id, ui);
} }
LayerSurfaceEventVariant::ScaleFactorChanged(..) => {} LayerSurfaceEventVariant::ScaleFactorChanged(..) => {}
LayerSurfaceEventVariant::Configure( LayerSurfaceEventVariant::Configure(
@ -902,7 +949,8 @@ impl SctkEvent {
); );
} }
let window = window_manager.insert( let window = window_manager.insert(
<<<<<<< HEAD
surface_id, surface_id,
sctk_winit, sctk_winit,
program, program,
@ -911,20 +959,74 @@ impl SctkEvent {
theme::Mode::None, // TODO do we really need to track the system theme here? theme::Mode::None, // TODO do we really need to track the system theme here?
); );
let logical_size = window.logical_size(); let logical_size = window.logical_size();
todo!()
// let _ = user_interfaces.insert(
// surface_id, let mut ui = crate::program::build_user_interface(
// crate::build_user_interface( program,
// program, user_interface::Cache::default(),
// user_interface::Cache::default(), &mut window.renderer,
// &mut window.renderer, logical_size,
// logical_size, debug,
// surface_id, surface_id,
// window.raw.clone(), window.raw.clone(),
// window.prev_dnd_destination_rectangles_count, window.prev_dnd_destination_rectangles_count,
// clipboard, clipboard,
// ), );
// );
_ = ui.update(
&vec![iced_runtime::core::Event::PlatformSpecific(
iced_runtime::core::event::PlatformSpecific::Wayland(
iced_runtime::core::event::wayland::Event::RequestResize,
),
)],
window.state.cursor(),
&mut window.renderer,
clipboard,
&mut Vec::new(),
);
if let Some(requested_size) = clipboard
.requested_logical_size
.lock()
.unwrap()
.take()
{
let requested_physical_size =
winit::dpi::PhysicalSize::new(
(requested_size.width as f64
* window.state.scale_factor())
.ceil()
as u32,
(requested_size.height as f64
* window.state.scale_factor())
.ceil()
as u32,
);
let physical_size = window.state.physical_size();
if requested_physical_size.width
!= physical_size.width
|| requested_physical_size.height
!= physical_size.height
{
// FIXME what to do when we are stuck in a configure event/resize request loop
// We don't have control over how winit handles this.
window.resize_enabled = true;
let s = winit::dpi::Size::Physical(
requested_physical_size,
);
_ = window.raw.request_surface_size(s);
window.raw.set_min_surface_size(Some(s));
window.raw.set_max_surface_size(Some(s));
window.state.synchronize(
&program,
surface_id,
window.raw.as_ref(),
);
}
}
let _ = user_interfaces.insert(surface_id, ui);
} }
PopupEventVariant::Configure(_, _, _) => {} // TODO PopupEventVariant::Configure(_, _, _) => {} // TODO
PopupEventVariant::RepositionionedPopup { token: _ } => {} PopupEventVariant::RepositionionedPopup { token: _ } => {}