From 48f0f6fb3ceb68fdb559ab38c8dcbb7b9ba3a13e Mon Sep 17 00:00:00 2001 From: Ivan Molodetskikh Date: Wed, 21 Feb 2024 21:27:44 +0400 Subject: Implement gradient borders --- src/layout/tile.rs | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) (limited to 'src/layout/tile.rs') diff --git a/src/layout/tile.rs b/src/layout/tile.rs index 28bcfb47..ca2779fe 100644 --- a/src/layout/tile.rs +++ b/src/layout/tile.rs @@ -7,7 +7,7 @@ use smithay::backend::renderer::element::utils::RescaleRenderElement; use smithay::backend::renderer::element::{Element, Kind}; use smithay::utils::{Logical, Point, Rectangle, Scale, Size}; -use super::focus_ring::FocusRing; +use super::focus_ring::{FocusRing, FocusRingRenderElement}; use super::{LayoutElement, LayoutElementRenderElement, Options}; use crate::animation::Animation; use crate::niri_render_elements; @@ -51,6 +51,7 @@ pub struct Tile { niri_render_elements! { TileRenderElement => { LayoutElement = LayoutElementRenderElement, + FocusRing = FocusRingRenderElement, SolidColor = SolidColorRenderElement, Offscreen = RescaleRenderElement, } @@ -297,6 +298,7 @@ impl Tile { renderer: &mut R, location: Point, scale: Scale, + view_size: Size, focus_ring: bool, ) -> impl Iterator> { let rv = self @@ -307,12 +309,21 @@ impl Tile { let elem = self.effective_border_width().map(|width| { self.border - .render(location + Point::from((width, width)), scale) + .render( + renderer, + location + Point::from((width, width)), + scale, + view_size, + ) .map(Into::into) }); let rv = rv.chain(elem.into_iter().flatten()); - let elem = focus_ring.then(|| self.focus_ring.render(location, scale).map(Into::into)); + let elem = focus_ring.then(|| { + self.focus_ring + .render(renderer, location, scale, view_size) + .map(Into::into) + }); let rv = rv.chain(elem.into_iter().flatten()); let elem = self.is_fullscreen.then(|| { @@ -333,11 +344,12 @@ impl Tile { renderer: &mut R, location: Point, scale: Scale, + view_size: Size, focus_ring: bool, ) -> impl Iterator> { if let Some(anim) = &self.open_animation { let renderer = renderer.as_gles_renderer(); - let elements = self.render_inner(renderer, location, scale, focus_ring); + let elements = self.render_inner(renderer, location, scale, view_size, focus_ring); let elements = elements.collect::>>(); let elem = OffscreenRenderElement::new( @@ -365,7 +377,7 @@ impl Tile { } else { self.window().set_offscreen_element_id(None); - let elements = self.render_inner(renderer, location, scale, focus_ring); + let elements = self.render_inner(renderer, location, scale, view_size, focus_ring); None.into_iter().chain(Some(elements).into_iter().flatten()) } } -- cgit