This commit is contained in:
Casper Storm 2023-05-23 15:28:45 +02:00
parent 1c86defab5
commit 1234d52812
11 changed files with 15 additions and 16 deletions

View file

@ -395,7 +395,7 @@ where
y: bounds.y + styling.shadow_offset.y, y: bounds.y + styling.shadow_offset.y,
..bounds ..bounds
}, },
border_radius: styling.border_radius.into(), border_radius: styling.border_radius,
border_width: 0.0, border_width: 0.0,
border_color: Color::TRANSPARENT, border_color: Color::TRANSPARENT,
}, },
@ -406,7 +406,7 @@ where
renderer.fill_quad( renderer.fill_quad(
renderer::Quad { renderer::Quad {
bounds, bounds,
border_radius: styling.border_radius.into(), border_radius: styling.border_radius,
border_width: styling.border_width, border_width: styling.border_width,
border_color: styling.border_color, border_color: styling.border_color,
}, },

View file

@ -269,7 +269,7 @@ where
renderer.fill_quad( renderer.fill_quad(
renderer::Quad { renderer::Quad {
bounds, bounds,
border_radius: custom_style.border_radius.into(), border_radius: custom_style.border_radius,
border_width: custom_style.border_width, border_width: custom_style.border_width,
border_color: custom_style.border_color, border_color: custom_style.border_color,
}, },

View file

@ -332,7 +332,7 @@ pub fn draw_background<Renderer>(
renderer.fill_quad( renderer.fill_quad(
renderer::Quad { renderer::Quad {
bounds, bounds,
border_radius: appearance.border_radius.into(), border_radius: appearance.border_radius,
border_width: appearance.border_width, border_width: appearance.border_width,
border_color: appearance.border_color, border_color: appearance.border_color,
}, },

View file

@ -307,7 +307,7 @@ where
bounds, bounds,
border_color: appearance.border_color, border_color: appearance.border_color,
border_width: appearance.border_width, border_width: appearance.border_width,
border_radius: appearance.border_radius.into(), border_radius: appearance.border_radius,
}, },
appearance.background, appearance.background,
); );
@ -515,7 +515,7 @@ where
}, },
border_color: Color::TRANSPARENT, border_color: Color::TRANSPARENT,
border_width: 0.0, border_width: 0.0,
border_radius: appearance.border_radius.into(), border_radius: appearance.border_radius,
}, },
appearance.selected_background, appearance.selected_background,
); );

View file

@ -857,8 +857,7 @@ pub fn draw<Renderer, T>(
renderer::Quad { renderer::Quad {
bounds, bounds,
border_radius: hovered_region_style border_radius: hovered_region_style
.border_radius .border_radius,
.into(),
border_width: hovered_region_style.border_width, border_width: hovered_region_style.border_width,
border_color: hovered_region_style.border_color, border_color: hovered_region_style.border_color,
}, },

View file

@ -624,7 +624,7 @@ pub fn draw<'a, T, Renderer>(
bounds, bounds,
border_color: style.border_color, border_color: style.border_color,
border_width: style.border_width, border_width: style.border_width,
border_radius: style.border_radius.into(), border_radius: style.border_radius,
}, },
style.background, style.background,
); );

View file

@ -133,7 +133,7 @@ where
renderer.fill_quad( renderer.fill_quad(
renderer::Quad { renderer::Quad {
bounds: Rectangle { ..bounds }, bounds: Rectangle { ..bounds },
border_radius: style.border_radius.into(), border_radius: style.border_radius,
border_width: 0.0, border_width: 0.0,
border_color: Color::TRANSPARENT, border_color: Color::TRANSPARENT,
}, },
@ -147,7 +147,7 @@ where
width: active_progress_width, width: active_progress_width,
..bounds ..bounds
}, },
border_radius: style.border_radius.into(), border_radius: style.border_radius,
border_width: 0.0, border_width: 0.0,
border_color: Color::TRANSPARENT, border_color: Color::TRANSPARENT,
}, },

View file

@ -125,7 +125,7 @@ where
renderer.fill_quad( renderer.fill_quad(
renderer::Quad { renderer::Quad {
bounds, bounds,
border_radius: style.radius.into(), border_radius: style.radius,
border_width: 0.0, border_width: 0.0,
border_color: Color::TRANSPARENT, border_color: Color::TRANSPARENT,
}, },

View file

@ -818,7 +818,7 @@ pub fn draw<Renderer>(
renderer.fill_quad( renderer.fill_quad(
renderer::Quad { renderer::Quad {
bounds: scrollbar.bounds, bounds: scrollbar.bounds,
border_radius: style.border_radius.into(), border_radius: style.border_radius,
border_width: style.border_width, border_width: style.border_width,
border_color: style.border_color, border_color: style.border_color,
}, },
@ -838,7 +838,7 @@ pub fn draw<Renderer>(
renderer.fill_quad( renderer.fill_quad(
renderer::Quad { renderer::Quad {
bounds: scrollbar.scroller.bounds, bounds: scrollbar.scroller.bounds,
border_radius: style.scroller.border_radius.into(), border_radius: style.scroller.border_radius,
border_width: style.scroller.border_width, border_width: style.scroller.border_width,
border_color: style.scroller.border_color, border_color: style.scroller.border_color,
}, },

View file

@ -433,7 +433,7 @@ pub fn draw<T, R>(
width: handle_width, width: handle_width,
height: handle_height, height: handle_height,
}, },
border_radius: handle_border_radius.into(), border_radius: handle_border_radius,
border_width: style.handle.border_width, border_width: style.handle.border_width,
border_color: style.handle.border_color, border_color: style.handle.border_color,
}, },

View file

@ -982,7 +982,7 @@ pub fn draw<Renderer>(
renderer.fill_quad( renderer.fill_quad(
renderer::Quad { renderer::Quad {
bounds, bounds,
border_radius: appearance.border_radius.into(), border_radius: appearance.border_radius,
border_width: appearance.border_width, border_width: appearance.border_width,
border_color: appearance.border_color, border_color: appearance.border_color,
}, },