Stencil #128
Merged
Stencil #128
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Drakulix
approved these changes
Mar 16, 2024
Comment on lines
+98
to
+152
| pub(crate) enum PanelRenderElement { | ||
| Wayland(WaylandSurfaceRenderElement<GlesRenderer>), | ||
| RoundedRectangle(RoundedRectangleShaderElement), | ||
| } | ||
|
|
||
| impl Element for PanelRenderElement { | ||
| fn id(&self) -> &smithay::backend::renderer::element::Id { | ||
| match self { | ||
| Self::Wayland(e) => e.id(), | ||
| Self::RoundedRectangle(e) => e.id(), | ||
| } | ||
| } | ||
|
|
||
| fn current_commit(&self) -> smithay::backend::renderer::utils::CommitCounter { | ||
| match self { | ||
| Self::Wayland(e) => e.current_commit(), | ||
| Self::RoundedRectangle(e) => e.current_commit(), | ||
| } | ||
| } | ||
|
|
||
| fn src(&self) -> Rectangle<f64, Buffer> { | ||
| match self { | ||
| Self::Wayland(e) => e.src(), | ||
| Self::RoundedRectangle(e) => e.src(), | ||
| } | ||
| } | ||
|
|
||
| fn geometry(&self, scale: smithay::utils::Scale<f64>) -> Rectangle<i32, Physical> { | ||
| match self { | ||
| Self::Wayland(e) => e.geometry(scale), | ||
| Self::RoundedRectangle(e) => e.geometry(scale), | ||
| } | ||
| } | ||
| } | ||
|
|
||
| impl RenderElement<GlesRenderer> for PanelRenderElement { | ||
| fn draw( | ||
| &self, | ||
| frame: &mut GlesFrame<'_>, | ||
| src: Rectangle<f64, Buffer>, | ||
| dst: Rectangle<i32, Physical>, | ||
| damage: &[Rectangle<i32, Physical>], | ||
| ) -> Result<(), GlesError> { | ||
| match self { | ||
| Self::Wayland(e) => e.draw(frame, src, dst, damage), | ||
| Self::RoundedRectangle(e) => e.draw(frame, src, dst, damage), | ||
| } | ||
| } | ||
|
|
||
| fn underlying_storage(&self, renderer: &mut GlesRenderer) -> Option<UnderlyingStorage> { | ||
| match self { | ||
| PanelRenderElement::Wayland(e) => e.underlying_storage(renderer), | ||
| PanelRenderElement::RoundedRectangle(e) => e.underlying_storage(renderer), | ||
| } | ||
| } |
There was a problem hiding this comment.
Given you are using a fixed Renderer type, you can probably use smithays render_elements-macro to generate all of this.
There was a problem hiding this comment.
I tried to do so but I couldn't figure out how to resolve the error when adding the RoundedRectangle variant. I'm not sure exactly why but it believed that it didn't meet the trait bounds.
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This fixes an issue of applet overdraw at the corners when there is a border radius, and also simplifies rendering quite a bit by using a shader instead of software rendering for the panel background.