This commit is contained in:
Jeremy Soller 2025-03-19 14:35:09 -06:00 • committed by Ashley Wulber
parent 4db71cb0e6
commit 7120db60ba
No known key found for this signature in database
GPG key ID: 5216D4F46A90A820

View file

@ -528,9 +528,11 @@ impl SctkState {
let mut common = subsurface.common.lock().unwrap(); let mut common = subsurface.common.lock().unwrap();
common.fractional_scale = Some(scale_factor); common.fractional_scale = Some(scale_factor);
if legacy { if legacy {
subsurface.instance.wl_surface.set_buffer_scale(scale_factor as _); subsurface
.instance
.wl_surface
.set_buffer_scale(scale_factor as _);
} }
} }
if let Some(popup) = self if let Some(popup) = self
@ -1248,7 +1250,6 @@ impl SctkState {
self.subsurfaces = remaining; self.subsurfaces = remaining;
for s in removed for s in removed
{ {
crate::subsurface_widget::remove_iced_subsurface( crate::subsurface_widget::remove_iced_subsurface(
&s.instance.wl_surface, &s.instance.wl_surface,
); );
@ -1370,7 +1371,6 @@ impl SctkState {
self.subsurfaces = remaining; self.subsurfaces = remaining;
for s in removed for s in removed
{ {
crate::subsurface_widget::remove_iced_subsurface( crate::subsurface_widget::remove_iced_subsurface(
&s.instance.wl_surface, &s.instance.wl_surface,
); );
@ -1579,10 +1579,10 @@ impl SctkState {
&self.queue_handle, &self.queue_handle,
cctk::sctk::globals::GlobalData, cctk::sctk::globals::GlobalData,
); );
let wp_fractional_scale = let wp_fractional_scale = self
self.fractional_scaling_manager.as_ref().map(|fsm| { .fractional_scaling_manager
fsm.fractional_scaling(&wl_surface, &self.queue_handle) .as_ref()
}); .map(|fsm| fsm.fractional_scaling(&wl_surface, &self.queue_handle));
let wp_alpha_modifier_surface = subsurface_state let wp_alpha_modifier_surface = subsurface_state
.wp_alpha_modifier .wp_alpha_modifier