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

Revert "subsurface_widget: Handle viewport and set source rectangle"

Browse source 
This reverts commit 15547dec8f83af1ea6dbed1964302400fc17c257 from
https://github.com/pop-os/iced/pull/227.

This is causing issues in `cosmic-workspaces`. It seems I didn't test it
properly outside the examples here... and this misinterpreted exactly
what the (undocumented) `viewport` argument means (Iced's `image` widget also
needed a fix to handle viewports properly since our fork:
https://github.com/iced-rs/iced/pull/2752).

It should be possible to fix, but revert for now.
This commit is contained in:
Ian Douglas Scott 2025-07-21 13:39:18 -07:00 • committed by Ashley Wulber
parent 7a1f8b3472
commit 5924fea0b1
No known key found for this signature in database
GPG key ID: 5216D4F46A90A820
2 changed files with 13 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1612,8 +1612,7 @@ impl SctkState {
wp_fractional_scale, wp_fractional_scale,
wl_buffer: None, wl_buffer: None,
source: None, bounds: Some(bounds),
destination: Some(bounds),
transform: transform:
cctk::wayland_client::protocol::wl_output::Transform::Normal, cctk::wayland_client::protocol::wl_output::Transform::Normal,
z: settings.z, z: settings.z,

55
winit/src/platform_specific/wayland/subsurface_widget.rs
View file

@ -454,8 +454,7 @@ impl SubsurfaceState {
wp_viewport, wp_viewport,
wp_alpha_modifier_surface, wp_alpha_modifier_surface,
wl_buffer: None, wl_buffer: None,
source: None, bounds: None,
destination: None,
wp_fractional_scale: None, wp_fractional_scale: None,
transform: wl_output::Transform::Normal, transform: wl_output::Transform::Normal,
z: 0, z: 0,
@ -631,8 +630,7 @@ pub(crate) struct SubsurfaceInstance {
pub(crate) wp_fractional_scale: Option<WpFractionalScaleV1>, pub(crate) wp_fractional_scale: Option<WpFractionalScaleV1>,
pub(crate) wp_alpha_modifier_surface: Option<WpAlphaModifierSurfaceV1>, pub(crate) wp_alpha_modifier_surface: Option<WpAlphaModifierSurfaceV1>,
pub(crate) wl_buffer: Option<WlBuffer>, pub(crate) wl_buffer: Option<WlBuffer>,
pub(crate) source: Option<Rectangle<f32>>, pub(crate) bounds: Option<Rectangle<f32>>,
pub(crate) destination: Option<Rectangle<f32>>,
pub(crate) transform: wl_output::Transform, pub(crate) transform: wl_output::Transform,
pub(crate) z: i32, pub(crate) z: i32,
pub parent: WlSurface, pub parent: WlSurface,
@ -679,21 +677,14 @@ impl SubsurfaceInstance {
}; };
// XXX scale factor? // XXX scale factor?
let source_changed = self.source != Some(info.source); let bounds_changed = self.bounds != Some(info.bounds);
let destination_changed = self.destination != Some(info.destination);
// wlroots seems to have issues changing buffer without running this // wlroots seems to have issues changing buffer without running this
if source_changed || destination_changed || buffer_changed { if bounds_changed || buffer_changed {
self.wp_viewport.set_source(
info.source.x.into(),
info.source.y.into(),
info.source.width.into(),
info.source.height.into(),
);
self.wl_subsurface self.wl_subsurface
.set_position(info.destination.x as i32, info.destination.y as i32); .set_position(info.bounds.x as i32, info.bounds.y as i32);
self.wp_viewport.set_destination( self.wp_viewport.set_destination(
info.destination.width as i32, info.bounds.width as i32,
info.destination.height as i32, info.bounds.height as i32,
); );
} }
let transform_changed = self.transform != info.transform; let transform_changed = self.transform != info.transform;
@ -704,7 +695,7 @@ impl SubsurfaceInstance {
self.wl_surface.attach(Some(&buffer), 0, 0); self.wl_surface.attach(Some(&buffer), 0, 0);
self.wl_surface.damage(0, 0, i32::MAX, i32::MAX); self.wl_surface.damage(0, 0, i32::MAX, i32::MAX);
} }
if buffer_changed || source_changed || destination_changed || transform_changed { if buffer_changed || bounds_changed || transform_changed {
_ = self.wl_surface.frame(&state.qh, self.wl_surface.clone()); _ = self.wl_surface.frame(&state.qh, self.wl_surface.clone());
self.wl_surface.commit(); self.wl_surface.commit();
} }
@ -716,8 +707,7 @@ impl SubsurfaceInstance {
} }
self.wl_buffer = Some(buffer); self.wl_buffer = Some(buffer);
self.source = Some(info.source); self.bounds = Some(info.bounds);
self.destination = Some(info.destination);
self.transform = info.transform; self.transform = info.transform;
self.z = info.z; self.z = info.z;
} }
@ -742,8 +732,7 @@ impl Drop for SubsurfaceInstance {
#[derive(Debug)] #[derive(Debug)]
pub(crate) struct SubsurfaceInfo { pub(crate) struct SubsurfaceInfo {
pub buffer: SubsurfaceBuffer, pub buffer: SubsurfaceBuffer,
pub source: Rectangle<f32>, pub bounds: Rectangle<f32>,
pub destination: Rectangle<f32>,
pub alpha: f32, pub alpha: f32,
pub transform: wl_output::Transform, pub transform: wl_output::Transform,
pub z: i32, pub z: i32,
@ -850,34 +839,14 @@ where
_style: &renderer::Style, _style: &renderer::Style,
layout: Layout<'_>, layout: Layout<'_>,
_cursor: mouse::Cursor, _cursor: mouse::Cursor,
viewport: &Rectangle, _viewport: &Rectangle,
) { ) {
let buffer_size =
Size::new(self.buffer.width() as f32, self.buffer.height() as f32);
let full_size =
self.content_fit.fit(buffer_size, layout.bounds().size());
let source = Rectangle {
x: viewport.x,
y: viewport.y,
width: viewport.width.min(self.buffer.width() as f32),
height: viewport.height.min(self.buffer.height() as f32),
};
let destination = Rectangle {
x: layout.bounds().x,
y: layout.bounds().y,
width: layout.bounds().width.min(viewport.width),
height: layout.bounds().height.min(viewport.height),
};
// Instead of using renderer, we need to add surface to a list that is // Instead of using renderer, we need to add surface to a list that is
// read by the iced-sctk shell. // read by the iced-sctk shell.
SUBSURFACES.with(|subsurfaces| { SUBSURFACES.with(|subsurfaces| {
subsurfaces.borrow_mut().push(SubsurfaceInfo { subsurfaces.borrow_mut().push(SubsurfaceInfo {
buffer: self.buffer.clone(), buffer: self.buffer.clone(),
source, bounds: layout.bounds(),
destination,
alpha: self.alpha, alpha: self.alpha,
transform: self.transform, transform: self.transform,
z: self.z, z: self.z,