djkato/egui
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add border around color button

Browse source
This commit is contained in:
Emil Ernerfeldt 2021-01-16 18:48:37 +01:00
parent 2b48f9723b
commit cc002763ed
1 changed files with 12 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
egui/src/widgets/color_picker.rs
View file

@ -66,27 +66,22 @@ fn show_hsva(ui: &mut Ui, color: Hsva, desired_size: Vec2) -> Response {
} }
fn color_button(ui: &mut Ui, color: Color32) -> Response { fn color_button(ui: &mut Ui, color: Color32) -> Response {
let desired_size = ui.style().spacing.interact_size; let size = ui.style().spacing.interact_size;
let (rect, response) = ui.allocate_at_least(desired_size, Sense::click()); let (rect, response) = ui.allocate_exact_size(size, Sense::click());
let visuals = ui.style().interact(&response); let visuals = ui.style().interact(&response);
let rect = rect.expand(visuals.expansion); let rect = rect.expand(visuals.expansion);
background_checkers(ui.painter(), rect); background_checkers(ui.painter(), rect);
let left_half = Rect::from_min_max(rect.left_top(), rect.center_bottom());
let right_half = Rect::from_min_max(rect.center_top(), rect.right_bottom());
ui.painter().rect_filled(left_half, 0.0, color);
ui.painter().rect_filled(right_half, 0.0, color.to_opaque());
let corner_radius = visuals.corner_radius.at_most(2.0); let corner_radius = visuals.corner_radius.at_most(2.0);
if true { ui.painter()
let left = Rect::from_min_max(rect.left_top(), rect.center_bottom()); .rect_stroke(rect, corner_radius, (2.0, visuals.bg_fill)); // fill is intentional!
let right = Rect::from_min_max(rect.center_top(), rect.right_bottom());
ui.painter().rect_filled(left, 0.0, color);
ui.painter().rect_filled(right, 0.0, color.to_opaque());
ui.painter()
.rect_stroke(rect, corner_radius, visuals.bg_stroke);
} else {
ui.painter().add(Shape::Rect {
rect,
corner_radius,
fill: color,
stroke: visuals.fg_stroke,
});
}
response response
} }