Skip to content

Omit type conversion in AsRenderElements::render_elements() #1626 #1699

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Omit type conversion in AsRenderElements::render_elements() #1626 #1699

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a284441
Omit type conversion in `AsRenderElements::render_elements()` #1626
kenoss Mar 24, 2025
35d81e6
anvil: Adopt `AsRenderElements::render_elements()` change
kenoss Mar 30, 2025
1c84c45
fix: cargo clippy
kenoss Mar 31, 2025
cfd8086
wlcs_anvil: Adopt `AsRenderElements::render_elements()` change
kenoss Mar 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 14 additions & 17 deletions anvil/src/drawing.rs
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,16 +71,13 @@ where
R: Renderer<TextureId = T> + ImportAll + ImportMem,
{
type RenderElement = PointerRenderElement<R>;
fn render_elements<E>(
fn render_elements(
&self,
renderer: &mut R,
location: Point<i32, Physical>,
scale: Scale<f64>,
alpha: f32,
) -> Vec<E>
where
E: From<PointerRenderElement<R>>,
{
) -> Vec<Self::RenderElement> {
match &self.status {
CursorImageStatus::Hidden => vec![],
// Always render `Default` for a named shape.
Expand All @@ -97,23 +94,23 @@ where
Kind::Cursor,
)
.expect("Lost system pointer buffer"),
)
.into()]
)]
} else {
vec![]
}
}
CursorImageStatus::Surface(surface) => {
let elements: Vec<PointerRenderElement<R>> =
smithay::backend::renderer::element::surface::render_elements_from_surface_tree(
renderer,
surface,
location,
scale,
alpha,
Kind::Cursor,
);
elements.into_iter().map(E::from).collect()
smithay::backend::renderer::element::surface::render_elements_from_surface_tree(
renderer,
surface,
location,
scale,
alpha,
Kind::Cursor,
)
.into_iter()
.map(PointerRenderElement::Surface)
.collect()
}
}
}
Expand Down
9 changes: 5 additions & 4 deletions anvil/src/render.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,15 +72,15 @@ impl<R: Renderer + ImportAll + ImportMem, E: RenderElement<R> + std::fmt::Debug>
}
}

pub fn space_preview_elements<'a, R, C>(
pub fn space_preview_elements<'a, R>(
renderer: &'a mut R,
space: &'a Space<WindowElement>,
output: &'a Output,
) -> impl Iterator<Item = C> + 'a
) -> impl Iterator<Item = CropRenderElement<RelocateRenderElement<RescaleRenderElement<WindowRenderElement<R>>>>>
+ 'a
where
R: Renderer + ImportAll + ImportMem,
R::TextureId: Clone + 'static,
C: From<CropRenderElement<RelocateRenderElement<RescaleRenderElement<WindowRenderElement<R>>>>> + 'a,
{
let constrain_behavior = ConstrainBehavior {
reference: ConstrainReference::BoundingBox,
Expand Down Expand Up @@ -173,7 +173,8 @@ where
.collect::<Vec<_>>();

if show_window_preview && space.elements_for_output(output).count() > 0 {
output_render_elements.extend(space_preview_elements(renderer, space, output));
output_render_elements
.extend(space_preview_elements(renderer, space, output).map(OutputRenderElements::Preview));
}

let space_elements = smithay::desktop::space::space_render_elements::<_, WindowElement, _>(
Expand Down
24 changes: 12 additions & 12 deletions anvil/src/shell/element.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -420,13 +420,13 @@ where
{
type RenderElement = WindowRenderElement<R>;

fn render_elements<C: From<Self::RenderElement>>(
fn render_elements(
&self,
renderer: &mut R,
mut location: Point<i32, Physical>,
scale: Scale<f64>,
alpha: f32,
) -> Vec<C> {
) -> Vec<Self::RenderElement> {
let window_bbox = SpaceElement::bbox(&self.0);

if self.decoration_state().is_ssd && !window_bbox.is_empty() {
Expand All @@ -435,24 +435,24 @@ where
let mut state = self.decoration_state();
let width = window_geo.size.w;
state.header_bar.redraw(width as u32);
let mut vec = AsRenderElements::<R>::render_elements::<WindowRenderElement<R>>(
&state.header_bar,
renderer,
location,
scale,
alpha,
);
let mut vec: Vec<WindowRenderElement<R>> =
AsRenderElements::<R>::render_elements(&state.header_bar, renderer, location, scale, alpha)
.into_iter()
.map(WindowRenderElement::Decoration)
.collect();

location.y += (scale.y * HEADER_BAR_HEIGHT as f64) as i32;

let window_elements =
AsRenderElements::render_elements(&self.0, renderer, location, scale, alpha);
AsRenderElements::render_elements(&self.0, renderer, location, scale, alpha)
.into_iter()
.map(WindowRenderElement::Window);
vec.extend(window_elements);
vec.into_iter().map(C::from).collect()
vec
} else {
AsRenderElements::render_elements(&self.0, renderer, location, scale, alpha)
.into_iter()
.map(C::from)
.map(WindowRenderElement::Window)
.collect()
}
}
Expand Down
13 changes: 5 additions & 8 deletions anvil/src/shell/ssd.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,13 +233,13 @@ impl HeaderBar {
impl<R: Renderer> AsRenderElements<R> for HeaderBar {
type RenderElement = SolidColorRenderElement;

fn render_elements<C: From<Self::RenderElement>>(
fn render_elements(
&self,
_renderer: &mut R,
location: Point<i32, smithay::utils::Physical>,
scale: smithay::utils::Scale<f64>,
alpha: f32,
) -> Vec<C> {
) -> Vec<Self::RenderElement> {
let header_end_offset: Point<i32, Logical> = Point::from((self.width as i32, 0));
let button_offset: Point<i32, Logical> = Point::from((BUTTON_WIDTH as i32, 0));

Expand All @@ -250,18 +250,15 @@ impl<R: Renderer> AsRenderElements<R> for HeaderBar {
scale,
alpha,
Kind::Unspecified,
)
.into(),
),
SolidColorRenderElement::from_buffer(
&self.maximize_button,
location + (header_end_offset - button_offset.upscale(2)).to_physical_precise_round(scale),
scale,
alpha,
Kind::Unspecified,
)
.into(),
SolidColorRenderElement::from_buffer(&self.background, location, scale, alpha, Kind::Unspecified)
.into(),
),
SolidColorRenderElement::from_buffer(&self.background, location, scale, alpha, Kind::Unspecified),
]
}
}
Expand Down
37 changes: 22 additions & 15 deletions anvil/src/udev.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1468,14 +1468,17 @@ fn render_surface<'a>(
}

custom_elements.extend(
pointer_element.render_elements(
renderer,
(cursor_pos - cursor_hotspot.to_f64())
.to_physical(scale)
.to_i32_round(),
scale,
1.0,
),
pointer_element
.render_elements(
renderer,
(cursor_pos - cursor_hotspot.to_f64())
.to_physical(scale)
.to_i32_round(),
scale,
1.0,
)
.into_iter()
.map(CustomRenderElements::Pointer),
);

// draw the dnd icon if applicable
Expand All @@ -1485,13 +1488,17 @@ fn render_surface<'a>(
.to_physical(scale)
.to_i32_round();
if icon.surface.alive() {
custom_elements.extend(AsRenderElements::<UdevRenderer<'a>>::render_elements(
&SurfaceTree::from_surface(&icon.surface),
renderer,
dnd_icon_pos,
scale,
1.0,
));
custom_elements.extend(
AsRenderElements::<UdevRenderer<'a>>::render_elements(
&SurfaceTree::from_surface(&icon.surface),
renderer,
dnd_icon_pos,
scale,
1.0,
)
.into_iter()
.map(CustomRenderElements::Surface),
);
}
}
}
Expand Down
37 changes: 22 additions & 15 deletions anvil/src/winit.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,14 +318,17 @@ pub fn run_winit() {
let mut elements = Vec::<CustomRenderElements<GlesRenderer>>::new();

elements.extend(
pointer_element.render_elements(
renderer,
(cursor_pos - cursor_hotspot.to_f64())
.to_physical(scale)
.to_i32_round(),
scale,
1.0,
),
pointer_element
.render_elements(
renderer,
(cursor_pos - cursor_hotspot.to_f64())
.to_physical(scale)
.to_i32_round(),
scale,
1.0,
)
.into_iter()
.map(CustomRenderElements::Pointer),
);

// draw the dnd icon if any
Expand All @@ -334,13 +337,17 @@ pub fn run_winit() {
.to_physical(scale)
.to_i32_round();
if icon.surface.alive() {
elements.extend(AsRenderElements::<GlesRenderer>::render_elements(
&smithay::desktop::space::SurfaceTree::from_surface(&icon.surface),
renderer,
dnd_icon_pos,
scale,
1.0,
));
elements.extend(
AsRenderElements::<GlesRenderer>::render_elements(
&smithay::desktop::space::SurfaceTree::from_surface(&icon.surface),
renderer,
dnd_icon_pos,
scale,
1.0,
)
.into_iter()
.map(CustomRenderElements::Surface),
);
}
}

Expand Down
37 changes: 22 additions & 15 deletions anvil/src/x11.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,14 +363,17 @@ pub fn run_x11() {

pointer_element.set_status(state.cursor_status.clone());
elements.extend(
pointer_element.render_elements(
&mut backend_data.renderer,
(cursor_pos - cursor_hotspot.to_f64())
.to_physical(scale)
.to_i32_round(),
scale,
1.0,
),
pointer_element
.render_elements(
&mut backend_data.renderer,
(cursor_pos - cursor_hotspot.to_f64())
.to_physical(scale)
.to_i32_round(),
scale,
1.0,
)
.into_iter()
.map(CustomRenderElements::Pointer),
);

// draw the dnd icon if any
Expand All @@ -379,13 +382,17 @@ pub fn run_x11() {
.to_physical(scale)
.to_i32_round();
if icon.surface.alive() {
elements.extend(AsRenderElements::<GlesRenderer>::render_elements(
&smithay::desktop::space::SurfaceTree::from_surface(&icon.surface),
&mut backend_data.renderer,
dnd_icon_pos,
scale,
1.0,
));
elements.extend(
AsRenderElements::<GlesRenderer>::render_elements(
&smithay::desktop::space::SurfaceTree::from_surface(&icon.surface),
&mut backend_data.renderer,
dnd_icon_pos,
scale,
1.0,
)
.into_iter()
.map(CustomRenderElements::Surface),
);
}
}

Expand Down
4 changes: 2 additions & 2 deletions src/backend/renderer/element/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -408,13 +408,13 @@ where
/// Type of the render element
type RenderElement: RenderElement<R>;
/// Returns render elements for a given position and scale
fn render_elements<C: From<Self::RenderElement>>(
fn render_elements(
&self,
renderer: &mut R,
location: Point<i32, Physical>,
scale: Scale<f64>,
alpha: f32,
) -> Vec<C>;
) -> Vec<Self::RenderElement>;
}

impl<E> Element for &E
Expand Down
16 changes: 11 additions & 5 deletions src/backend/renderer/element/solid.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,13 +242,19 @@ where
{
type RenderElement = SolidColorRenderElement;

fn render_elements<C: From<Self::RenderElement>>(
fn render_elements(
&self,
_renderer: &mut R,
location: crate::utils::Point<i32, crate::utils::Physical>,
scale: crate::utils::Scale<f64>,
location: Point<i32, Physical>,
scale: Scale<f64>,
alpha: f32,
) -> Vec<C> {
vec![SolidColorRenderElement::from_buffer(self, location, scale, alpha, Kind::Unspecified).into()]
) -> Vec<Self::RenderElement> {
vec![SolidColorRenderElement::from_buffer(
self,
location,
scale,
alpha,
Kind::Unspecified,
)]
}
}
Loading
Loading