Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Transpose the value/satuation panel of the color picker #2727

Merged
merged 3 commits into from
Feb 28, 2023
Merged

Transpose the value/satuation panel of the color picker #2727

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
12cf4dd
hsva color_slider_2d orientation change
IVAN-MK7 Feb 12, 2023
fd3a873
color_slider_2d doc fix
IVAN-MK7 Feb 12, 2023
4835985
Merge branch 'emilk:master' into hsva_color_slider_2d_orientation
IVAN-MK7 Feb 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion crates/egui/src/widgets/color_picker.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,12 @@ fn color_slider_1d(ui: &mut Ui, value: &mut f32, color_at: impl Fn(f32) -> Color
response
}

/// # Arguments
/// * `x_value` - X axis, either saturation or value (0.0-1.0).
/// * `y_value` - Y axis, either saturation or value (0.0-1.0).
/// * `color_at` - A function that dictates how the mix of saturation and value will be displayed in the 2d slider.
/// E.g.: `|x_value, y_value| HsvaGamma { h: 1.0, s: x_value, v: y_value, a: 1.0 }.into()` displays the colors as follows: top-left: white \[s: 0.0, v: 1.0], top-right: fully saturated color \[s: 1.0, v: 1.0], bottom-right: black \[s: 0.0, v: 1.0].
///
fn color_slider_2d(
ui: &mut Ui,
x_value: &mut f32,
Expand Down Expand Up @@ -308,7 +314,7 @@ fn color_picker_hsvag_2d(ui: &mut Ui, hsva: &mut HsvaGamma, alpha: Alpha) {
color_slider_1d(ui, v, |v| HsvaGamma { v, ..opaque }.into()).on_hover_text("Value");
}

color_slider_2d(ui, v, s, |v, s| HsvaGamma { s, v, ..opaque }.into());
color_slider_2d(ui, s, v, |s, v| HsvaGamma { s, v, ..opaque }.into());
}

//// Shows a color picker where the user can change the given [`Hsva`] color.
Expand Down