From cc906c83cdf896d94b7ccf91258466714be631f6 Mon Sep 17 00:00:00 2001 From: Nick Senger Date: Wed, 8 Nov 2023 19:12:53 -0800 Subject: feat: quad shadows --- widget/src/overlay/menu.rs | 2 ++ 1 file changed, 2 insertions(+) (limited to 'widget/src/overlay') diff --git a/widget/src/overlay/menu.rs b/widget/src/overlay/menu.rs index f83eebea..03935e59 100644 --- a/widget/src/overlay/menu.rs +++ b/widget/src/overlay/menu.rs @@ -309,6 +309,7 @@ where border_color: appearance.border_color, border_width: appearance.border_width, border_radius: appearance.border_radius, + shadow: Default::default(), }, appearance.background, ); @@ -519,6 +520,7 @@ where border_color: Color::TRANSPARENT, border_width: 0.0, border_radius: appearance.border_radius, + shadow: Default::default(), }, appearance.selected_background, ); -- cgit From 370b2f6df799c948188d3949e34112258b2a8498 Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Sat, 20 Jan 2024 12:25:07 +0100 Subject: Use `Default` implementation of `renderer::Quad` --- widget/src/overlay/menu.rs | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'widget/src/overlay') diff --git a/widget/src/overlay/menu.rs b/widget/src/overlay/menu.rs index 03935e59..2086e993 100644 --- a/widget/src/overlay/menu.rs +++ b/widget/src/overlay/menu.rs @@ -10,7 +10,7 @@ use crate::core::text::{self, Text}; use crate::core::touch; use crate::core::widget::Tree; use crate::core::{ - Clipboard, Color, Length, Padding, Pixels, Point, Rectangle, Size, Vector, + Clipboard, Length, Padding, Pixels, Point, Rectangle, Size, Vector, }; use crate::core::{Element, Shell, Widget}; use crate::scrollable::{self, Scrollable}; @@ -309,7 +309,7 @@ where border_color: appearance.border_color, border_width: appearance.border_width, border_radius: appearance.border_radius, - shadow: Default::default(), + ..renderer::Quad::default() }, appearance.background, ); @@ -517,10 +517,8 @@ where width: bounds.width - appearance.border_width * 2.0, ..bounds }, - border_color: Color::TRANSPARENT, - border_width: 0.0, border_radius: appearance.border_radius, - shadow: Default::default(), + ..renderer::Quad::default() }, appearance.selected_background, ); -- cgit From 25f182f933ea6b7c112c8f9a450a98dc9b9eebdd Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Sat, 20 Jan 2024 13:29:25 +0100 Subject: Introduce `Border` struct analogous to `Shadow` --- widget/src/overlay/menu.rs | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'widget/src/overlay') diff --git a/widget/src/overlay/menu.rs b/widget/src/overlay/menu.rs index 2086e993..678bb7b5 100644 --- a/widget/src/overlay/menu.rs +++ b/widget/src/overlay/menu.rs @@ -10,7 +10,7 @@ use crate::core::text::{self, Text}; use crate::core::touch; use crate::core::widget::Tree; use crate::core::{ - Clipboard, Length, Padding, Pixels, Point, Rectangle, Size, Vector, + Border, Clipboard, Length, Padding, Pixels, Point, Rectangle, Size, Vector, }; use crate::core::{Element, Shell, Widget}; use crate::scrollable::{self, Scrollable}; @@ -306,9 +306,7 @@ where renderer.fill_quad( renderer::Quad { bounds, - border_color: appearance.border_color, - border_width: appearance.border_width, - border_radius: appearance.border_radius, + border: appearance.border, ..renderer::Quad::default() }, appearance.background, @@ -513,11 +511,11 @@ where renderer.fill_quad( renderer::Quad { bounds: Rectangle { - x: bounds.x + appearance.border_width, - width: bounds.width - appearance.border_width * 2.0, + x: bounds.x + appearance.border.width, + width: bounds.width - appearance.border.width * 2.0, ..bounds }, - border_radius: appearance.border_radius, + border: Border::with_radius(appearance.border.radius), ..renderer::Quad::default() }, appearance.selected_background, -- cgit