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

fix: create fractional scale for sctk subsurfaces

Browse source
This commit is contained in:
Ashley Wulber 2025-03-18 16:56:27 -04:00
parent 93bc4bbd88
commit 4db71cb0e6
No known key found for this signature in database
GPG key ID: 5216D4F46A90A820
2 changed files with 18 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

21
winit/src/platform_specific/wayland/event_loop/state.rs
View file

@ -518,15 +518,19 @@ impl SctkState {
let mut id = None;
for subsurface in &self.subsurfaces {
if subsurface.instance.parent != surface.id() {
if subsurface.instance.wl_surface != *surface {
continue;
}
id = Some(subsurface.id);
if legacy && subsurface.instance.wp_fractional_scale.is_some() {
return;
}
let mut common = subsurface.common.lock().unwrap();
common.fractional_scale = Some(scale_factor);
if legacy {
subsurface.instance.wl_surface.set_buffer_scale(scale_factor as _);
}
self.sctk_events.push(SctkEvent::SurfaceScaleFactorChanged(
scale_factor,
surface.clone(),
subsurface.id,
));
}
if let Some(popup) = self
@ -1575,6 +1579,10 @@ impl SctkState {
&self.queue_handle,
cctk::sctk::globals::GlobalData,
);
let wp_fractional_scale =
self.fractional_scaling_manager.as_ref().map(|fsm| {
fsm.fractional_scaling(&wl_surface, &self.queue_handle)
});
let wp_alpha_modifier_surface = subsurface_state
.wp_alpha_modifier
@ -1595,6 +1603,7 @@ impl SctkState {
wl_subsurface: wl_subsurface.clone(),
wp_viewport: wp_viewport.clone(),
wp_alpha_modifier_surface: wp_alpha_modifier_surface,
wp_fractional_scale,
wl_buffer: None,
bounds: Some(bounds),