From a4d1587e69fa38e12e98cc2fc13bd759c811ce25 Mon Sep 17 00:00:00 2001 From: aiongg Date: Thu, 12 Nov 2026 05:10:34 +0000 Subject: [PATCH] Gradient chips: one 16:9 chip aspect and one chip look (swatch corners and ring) for the gradient swatch and the gradient palette cells --- crates/draw/src/ui/gradient/palette/mod.rs | 8 +++-- crates/draw/src/ui/gradient/ramp.rs | 20 +++++++++++-- crates/draw/src/ui/gradient/swatch.rs | 34 ++++++++++------------ 3 files changed, 39 insertions(+), 23 deletions(-) diff --git a/crates/draw/src/ui/gradient/palette/mod.rs b/crates/draw/src/ui/gradient/palette/mod.rs index 77c03e99a..27adb02e7 100644 --- a/crates/draw/src/ui/gradient/palette/mod.rs +++ b/crates/draw/src/ui/gradient/palette/mod.rs @@ -3,7 +3,7 @@ //! the palette supplies the rows and paints each preset's thumbnail as a gradient ramp. use craft_ui::contract::{Bind, NoValue, Outcome, Pattern}; -use craft_ui::patterns::presets::{PresetBrowser, PresetEvent, PresetRow, PresetState}; +use craft_ui::patterns::presets::{CellShape, PresetBrowser, PresetEvent, PresetRow, PresetState}; use craft_ui::runtime::env::Label; use egui::{Response, Ui}; @@ -196,10 +196,12 @@ impl<'a> GradientPalette<'a> { let thumb = move |cx: &craft_ui::primitives::ContentPainterCx, rect: egui::Rect, info: craft_ui::patterns::presets::ThumbInfo<'_, GradientRef>| { if let Some(stops) = stops_of(groups, recent, *info.key) { - GradientRamp::paint(cx, rect, egui::CornerRadius::ZERO, &GradientRamp::colors(stops, sampler)); + let (radius, edge) = GradientRamp::chip_look(&cx.style_cx()); + GradientRamp::paint_chip(cx, rect, radius, &GradientRamp::colors(stops, sampler), edge); } }; - let mut browser = PresetBrowser::new(self.label, self.state, &rows).thumb(thumb); + let (wide, high) = GradientRamp::CHIP_ASPECT; + let mut browser = PresetBrowser::new(self.label, self.state, &rows).cell_shape(CellShape::ratio(wide, high)).thumb(thumb); if let Some(selected) = self.selected { browser = browser.selected(selected); } diff --git a/crates/draw/src/ui/gradient/ramp.rs b/crates/draw/src/ui/gradient/ramp.rs index e4bab2314..aa4d31c49 100644 --- a/crates/draw/src/ui/gradient/ramp.rs +++ b/crates/draw/src/ui/gradient/ramp.rs @@ -2,8 +2,9 @@ use craft_behavior::Axis; use craft_theme::Srgba; -use craft_ui::primitives::{Checker, ContentPainterCx}; -use craft_ui::style::DataColor; +use craft_ui::choice::SwatchMetrics; +use craft_ui::primitives::{Checker, ContentPainterCx, PaintShape, StrokeWidth}; +use craft_ui::style::{DataColor, StyleColor, StyleCx}; use egui::{Color32, CornerRadius, Rect}; use super::stops::Sampler; @@ -19,6 +20,9 @@ const EVEN_SAMPLES: usize = 64; pub struct GradientRamp; impl GradientRamp { + /// Width to height of a gradient chip, a swatch or a palette cell: wide enough that the ramp reads along it. + pub const CHIP_ASPECT: (u16, u16) = (16, 9); + /// The colours to draw `stops` with at the locations a mesh needs: the ends, every stop and /// midpoint of both rows, and even steps between, from `sampler`. pub fn colors(stops: &GradientStops, sampler: &Sampler) -> Vec<(f32, Srgba)> { @@ -54,4 +58,16 @@ impl GradientRamp { let stops: Vec<(f32, DataColor)> = colors.iter().map(|&(at, c)| (at, DataColor::new(Color32::from(c)))).collect(); cx.ramp(rect, radius, &stops, Axis::X); } + + /// The corners and the ring of a gradient chip: the colour swatch's corners and `line.control_edge`. + pub fn chip_look(cx: &StyleCx<'_>) -> (CornerRadius, StyleColor) { + (SwatchMetrics::of(cx).radius, cx.color(cx.tokens.color.line.control_edge)) + } + + /// A gradient chip: `colors` across `rect` in corners of `radius`, inside a thin `edge` ring that separates it + /// from the panel. + pub fn paint_chip(cx: &ContentPainterCx<'_>, rect: Rect, radius: CornerRadius, colors: &[(f32, Srgba)], edge: StyleColor) { + Self::paint(cx, rect, radius, colors); + cx.with_draw(|draw| draw.stroke(&PaintShape::Rect(rect, radius), StrokeWidth::Thin, edge)); + } } diff --git a/crates/draw/src/ui/gradient/swatch.rs b/crates/draw/src/ui/gradient/swatch.rs index 571481ec1..98d40e7a5 100644 --- a/crates/draw/src/ui/gradient/swatch.rs +++ b/crates/draw/src/ui/gradient/swatch.rs @@ -4,7 +4,6 @@ use craft_behavior::{Axis, CursorIcon, CursorPriority, Metrics, Sense}; use craft_theme::{Stateful, States}; use craft_ui::choice::SwatchMetrics; use craft_ui::contract::{Access, Common, Component, Cx, MeasureCx, Outcome, PaintUi, Pointer as _, PopupKind, Props as _, Role, Styled as _}; -use craft_ui::primitives::{PaintShape, StrokeWidth}; use craft_ui::style::{ComponentStyle, FocusLook, StyleColor, StyleCx}; use egui::{CornerRadius, Response, Vec2}; @@ -15,7 +14,7 @@ use super::value::{GradientStops, StopRows}; #[cfg(feature = "screen-testing")] mod stories; -/// The style of a gradient swatch: the colour swatch's side, corners and ring. +/// The style of a gradient swatch: the colour swatch's height, corners and ring. #[derive(Clone, Debug, PartialEq, ComponentStyle)] #[non_exhaustive] pub struct GradientSwatchStyle { @@ -23,7 +22,7 @@ pub struct GradientSwatchStyle { metrics: Metrics, #[style(focus)] focus: FocusLook, - /// The side of the square well. + /// The height of the well: the colour swatch's side. side: f32, /// The well's corners. radius: CornerRadius, @@ -53,10 +52,10 @@ impl Outcome for GradientSwatchOutput { /// `if GradientSwatch::new("Gradient", &stops).show(ui).clicked { open_editor }`. /// /// The ramp is drawn over the checkerboard where it is translucent, inside the swatch's ring. The -/// swatch edits nothing; a click is the host's cue. `fill` takes the width the layout offers (an -/// options bar cell), else the well is square. AccessKit sees a button named by the label, with -/// `has_popup` when the host opens a dialog on the click. A disabled swatch keeps its gradient and -/// fades its ring. +/// swatch edits nothing; a click is the host's cue. The well has the gradient chip aspect +/// (`GradientRamp::CHIP_ASPECT`); `fill` takes the wider width the layout offers (an options bar +/// cell). AccessKit sees a button named by the label, with `has_popup` when the host opens a +/// dialog on the click. A disabled swatch keeps its gradient and fades its ring. #[derive(craft_ui::contract::Component, craft_ui::contract::Props)] #[component(content_painter)] pub struct GradientSwatch<'a> { @@ -94,23 +93,23 @@ impl Component for GradientSwatch<'_> { type Output = GradientSwatchOutput; fn style(cx: &StyleCx<'_>, _: GradientSwatchStyleKey) -> GradientSwatchStyle { - let metrics = SwatchMetrics::of(cx); - let colors = &cx.tokens.color; - let rest = cx.color(colors.line.control_edge); - let disabled = cx.color(colors.text.disabled); + let (radius, rest) = GradientRamp::chip_look(cx); + let disabled = cx.color(cx.tokens.color.text.disabled); GradientSwatchStyle { metrics: Metrics::new(), focus: cx.focus_look(), - side: metrics.side, - radius: metrics.radius, + side: SwatchMetrics::of(cx).side, + radius, edge: Stateful::new(rest).off(States::new(rest, rest, rest, disabled)), } } fn measure(&mut self, cx: &MeasureCx<'_, Self>) -> Vec2 { - let side = cx.style.side; - let width = if self.fill { cx.room.filter(|room| room.is_finite()).map_or(side, |room| room.max(side)) } else { side }; - Vec2::new(width, side) + let height = cx.style.side; + let (wide, high) = GradientRamp::CHIP_ASPECT; + let chip = height * f32::from(wide) / f32::from(high); + let width = if self.fill { cx.room.filter(|room| room.is_finite()).map_or(chip, |room| room.max(chip)) } else { chip }; + Vec2::new(width, height) } fn fills(&self) -> Option { @@ -139,8 +138,7 @@ impl Component for GradientSwatch<'_> { let default = default_sampler(self.rows); let sampler: &Sampler = self.sampler.unwrap_or(&default); let colors = GradientRamp::colors(self.stops, sampler); - GradientRamp::paint(&ui.content_painter(cx), cx.rect, style.radius, &colors); - ui.draw().stroke(&PaintShape::Rect(cx.rect, style.radius), StrokeWidth::Thin, cx.resolve(&style.edge)); + GradientRamp::paint_chip(&ui.content_painter(cx), cx.rect, style.radius, &colors, cx.resolve(&style.edge)); } fn finish(self, cx: Cx<'_, Self>) -> GradientSwatchOutput {