1
0
mirror of https://github.com/emilk/egui.git synced 2026-09-01 22:30:03 -04:00

Add indeterminate state to checkbox (#3605)

<!--
Please read the "Making a PR" section of
[`CONTRIBUTING.md`](https://github.com/emilk/egui/blob/master/CONTRIBUTING.md)
before opening a Pull Request!

* Keep your PR:s small and focused.
* If applicable, add a screenshot or gif.
* If it is a non-trivial addition, consider adding a demo for it to
`egui_demo_lib`, or a new example.
* Do NOT open PR:s from your `master` branch, as that makes it hard for
maintainers to add commits to your PR.
* Remember to run `cargo fmt` and `cargo cranky`.
* Open the PR as a draft until you have self-reviewed it and run
`./scripts/check.sh`.
* When you have addressed a PR comment, mark it as resolved.

Please be patient! I will review your PR, but my time is limited!
-->
This commit is contained in:
YgorSouza
2024-01-06 22:34:23 +01:00
committed by GitHub
parent 932fdae9e6
commit 797406de39
3 changed files with 60 additions and 7 deletions

View File

@@ -655,6 +655,9 @@ impl Response {
} else {
Checked::False
});
} else if matches!(info.typ, WidgetType::Checkbox) {
// Indeterminate state
builder.set_checked(Checked::Mixed);
}
}

View File

@@ -356,6 +356,7 @@ impl Widget for Button<'_> {
pub struct Checkbox<'a> {
checked: &'a mut bool,
text: WidgetText,
indeterminate: bool,
}
impl<'a> Checkbox<'a> {
@@ -363,17 +364,32 @@ impl<'a> Checkbox<'a> {
Checkbox {
checked,
text: text.into(),
indeterminate: false,
}
}
pub fn without_text(checked: &'a mut bool) -> Self {
Self::new(checked, WidgetText::default())
}
/// Display an indeterminate state (neither checked nor unchecked)
///
/// This only affects the checkbox's appearance. It will still toggle its boolean value when
/// clicked.
#[inline]
pub fn indeterminate(mut self, indeterminate: bool) -> Self {
self.indeterminate = indeterminate;
self
}
}
impl<'a> Widget for Checkbox<'a> {
fn ui(self, ui: &mut Ui) -> Response {
let Checkbox { checked, text } = self;
let Checkbox {
checked,
text,
indeterminate,
} = self;
let spacing = &ui.spacing();
let icon_width = spacing.icon_width;
@@ -402,11 +418,18 @@ impl<'a> Widget for Checkbox<'a> {
response.mark_changed();
}
response.widget_info(|| {
WidgetInfo::selected(
WidgetType::Checkbox,
*checked,
galley.as_ref().map_or("", |x| x.text()),
)
if indeterminate {
WidgetInfo::labeled(
WidgetType::Checkbox,
galley.as_ref().map_or("", |x| x.text()),
)
} else {
WidgetInfo::selected(
WidgetType::Checkbox,
*checked,
galley.as_ref().map_or("", |x| x.text()),
)
}
});
if ui.is_rect_visible(rect) {
@@ -420,7 +443,14 @@ impl<'a> Widget for Checkbox<'a> {
visuals.bg_stroke,
));
if *checked {
if indeterminate {
// Horizontal line:
ui.painter().add(Shape::hline(
small_icon_rect.x_range(),
small_icon_rect.center().y,
visuals.fg_stroke,
));
} else if *checked {
// Check mark:
ui.painter().add(Shape::line(
vec![