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

fix: convert sctk configure events to Opened and Resized

Browse source
This commit is contained in:
Ashley Wulber 2024-11-27 16:48:35 -05:00
parent 39d88f2ffa
commit 8e08ceb25c
No known key found for this signature in database
GPG key ID: 5216D4F46A90A820
1 changed files with 87 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -17,7 +17,7 @@ use dnd::DndSurface;
use iced_debug::core::theme; use iced_debug::core::theme;
use iced_futures::{ use iced_futures::{
core::{ core::{
Clipboard as _, Clipboard as _, Clipboard as _, Size,
event::{ event::{
PlatformSpecific, PlatformSpecific,
wayland::{ wayland::{
@ -844,9 +844,12 @@ impl SctkEvent {
surface, surface,
first, first,
) => { ) => {
if let Some(w) = surface_ids if let Some((id, w)) =
.get(&surface.id()) surface_ids.get(&surface.id()).and_then(|id| {
.and_then(|id| window_manager.get_mut(id.inner())) window_manager
.get_mut(id.inner())
.map(|v| (id.inner(), v))
})
{ {
let scale = w.state.scale_factor(); let scale = w.state.scale_factor();
let p_w = (configure.new_size.0.max(1) as f64 * scale) let p_w = (configure.new_size.0.max(1) as f64 * scale)
@ -860,6 +863,26 @@ impl SctkEvent {
p_w, p_h, p_w, p_h,
)), )),
); );
if first {
events.push((
Some(id),
iced_runtime::core::Event::Window(
window::Event::Resized(
w.state.logical_size(),
),
),
))
} else {
events.push((
Some(id),
iced_runtime::core::Event::Window(
window::Event::Opened {
size: w.state.logical_size(),
position: Default::default(),
},
),
))
}
} }
} }
}, },
@ -1054,7 +1077,34 @@ impl SctkEvent {
let _ = user_interfaces.insert(surface_id, ui); let _ = user_interfaces.insert(surface_id, ui);
} }
PopupEventVariant::Configure(_, _, _) => {} // TODO PopupEventVariant::Configure(configure, surface, first) => {
let size = Size::new(
configure.width as f32,
configure.height as f32,
);
if let Some(id) =
surface_ids.get(&surface.id()).map(|id| id.inner())
{
if first {
events.push((
Some(id),
iced_runtime::core::Event::Window(
window::Event::Resized(size),
),
))
} else {
events.push((
Some(id),
iced_runtime::core::Event::Window(
window::Event::Opened {
size: size,
position: Default::default(),
},
),
))
}
}
} // TODO
PopupEventVariant::RepositionionedPopup { token: _ } => {} PopupEventVariant::RepositionionedPopup { token: _ } => {}
PopupEventVariant::Size(_, _) => {} PopupEventVariant::Size(_, _) => {}
PopupEventVariant::ScaleFactorChanged(..) => {} PopupEventVariant::ScaleFactorChanged(..) => {}
@ -1202,7 +1252,38 @@ impl SctkEvent {
// ), // ),
// ); // );
} }
SctkEvent::SessionLockSurfaceConfigure { .. } => {} SctkEvent::SessionLockSurfaceConfigure {
surface,
configure,
first,
} => {
let size = Size::new(
configure.new_size.0 as f32,
configure.new_size.1 as f32,
);
if let Some(id) =
surface_ids.get(&surface.id()).map(|id| id.inner())
{
if first {
events.push((
Some(id),
iced_runtime::core::Event::Window(
window::Event::Resized(size),
),
))
} else {
events.push((
Some(id),
iced_runtime::core::Event::Window(
window::Event::Opened {
size: size,
position: Default::default(),
},
),
))
}
}
}
SctkEvent::SessionLockSurfaceDone { surface } => { SctkEvent::SessionLockSurfaceDone { surface } => {
if let Some(id) = surface_ids.remove(&surface.id()) { if let Some(id) = surface_ids.remove(&surface.id()) {
_ = window_manager.remove(id.inner()); _ = window_manager.remove(id.inner());