elias/imgui-rs
1
0
Fork 0
mirror of https://github.com/eliasstepanik/imgui-rs.git synced 2026-01-11 05:28:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

added ui.selectable

Browse Source
This commit is contained in:
Jack Mac 2021-10-19 18:09:17 -04:00
parent 2eebba5662
commit 01424da04d
4 changed files with 50 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
imgui-examples/examples/test_window_impl.rs
View File

@ -503,7 +503,7 @@ fn show_test_window(ui: &Ui, state: &mut State, opened: &mut bool) {
ListBox::new("selectables list").build(ui, || {
for (index, name) in names.iter().enumerate() {
let selected = matches!(state.selected_fish2, Some(i) if i == index );
if Selectable::new(name).selected(selected).build(ui) {
if ui.selectable_config(name).selected(selected).build() {
state.selected_fish2 = Some(index);
}
}
@ -513,7 +513,7 @@ fn show_test_window(ui: &Ui, state: &mut State, opened: &mut bool) {
ListBox::new("selectable list 2").size([0.0, last_size[1] * 0.66]).build(ui, || {
for (index, name) in names.iter().enumerate() {
let selected = matches!(state.selected_fish2, Some(i) if i == index );
if Selectable::new(name).selected(selected).build(ui) {
if ui.selectable_config(name).selected(selected).build() {
state.selected_fish2 = Some(index);
}
}
@ -757,7 +757,7 @@ CTRL+click on individual component to input value.\n",
ui.text("Aquarium");
ui.separator();
for (index, name) in names.iter().enumerate() {
if Selectable::new(name).build(ui) {
if ui.selectable(name) {
state.selected_fish = Some(index);
}
}

3
imgui/src/widget/combo_box.rs
View File

@ -283,7 +283,6 @@ impl Ui {
where
for<'b> L: Fn(&'b V) -> Cow<'b, str>,
{
use crate::widget::selectable::Selectable;
let label_fn = &label_fn;
let mut result = false;
let preview_value = items.get(*current_item).map(label_fn);
@ -292,7 +291,7 @@ impl Ui {
for (idx, item) in items.iter().enumerate() {
let text = label_fn(item);
let selected = idx == *current_item;
if Selectable::new(&text).selected(selected).build(self) {
if self.selectable_config(&text).selected(selected).build() {
*current_item = idx;
result = true;
}

3
imgui/src/widget/list_box.rs
View File

@ -79,14 +79,13 @@ impl<T: AsRef<str>> ListBox<T> {
where
for<'b> L: Fn(&'b V) -> Cow<'b, str>,
{
use crate::widget::selectable::Selectable;
let mut result = false;
let lb = self;
if let Some(_cb) = lb.begin(ui) {
for (idx, item) in items.iter().enumerate() {
let text = label_fn(item);
let selected = idx == *current_item;
if Selectable::new(&text).selected(selected).build(ui) {
if ui.selectable_config(&text).selected(selected).build() {
*current_item = idx;
result = true;
}

70
imgui/src/widget/selectable.rs
View File

@ -21,36 +21,60 @@ bitflags!(
}
);
/// Builder for a selectable widget.
#[derive(Copy, Clone, Debug)]
#[must_use]
pub struct Selectable<T> {
label: T,
selected: bool,
flags: SelectableFlags,
size: [f32; 2],
}
impl<T: AsRef<str>> Selectable<T> {
/// Constructs a new selectable builder.
#[inline]
impl Ui {
/// Constructs a new simple selectable.
///
/// Use [selectable_config] for a builder with additional options.
///
/// [selectable_config]: Self::selectable_config
#[doc(alias = "Selectable")]
pub fn new(label: T) -> Self {
pub fn selectable<T: AsRef<str>>(&self, label: T) -> bool {
self.selectable_config(label).build()
}
/// Constructs a new selectable builder.
#[doc(alias = "Selectable")]
pub fn selectable_config<T: AsRef<str>>(&self, label: T) -> Selectable<'_, T> {
Selectable {
label,
selected: false,
flags: SelectableFlags::empty(),
size: [0.0, 0.0],
ui: self,
}
}
}
/// Builder for a selectable widget.
#[derive(Copy, Clone, Debug)]
#[must_use]
pub struct Selectable<'ui, T> {
label: T,
selected: bool,
flags: SelectableFlags,
size: [f32; 2],
ui: &'ui Ui,
}
impl<'ui, T: AsRef<str>> Selectable<'ui, T> {
/// Constructs a new selectable builder.
#[doc(alias = "Selectable")]
#[deprecated(since = "0.9.0", note = "use `ui.selectable` or `ui.selectable_config`")]
pub fn new(label: T, ui: &'ui Ui) -> Self {
Selectable {
label,
selected: false,
flags: SelectableFlags::empty(),
size: [0.0, 0.0],
ui,
}
}
/// Replaces all current settings with the given flags
#[inline]
pub fn flags(mut self, flags: SelectableFlags) -> Self {
self.flags = flags;
self
}
/// Sets the selected state of the selectable
#[inline]
pub fn selected(mut self, selected: bool) -> Self {
self.selected = selected;
self
@ -58,7 +82,6 @@ impl<T: AsRef<str>> Selectable<T> {
/// Enables/disables closing parent popup window on click.
///
/// Default: enabled
#[inline]
pub fn close_popups(mut self, value: bool) -> Self {
self.flags.set(SelectableFlags::DONT_CLOSE_POPUPS, !value);
self
@ -66,7 +89,6 @@ impl<T: AsRef<str>> Selectable<T> {
/// Enables/disables full column span (text will still fit in the current column).
///
/// Default: disabled
#[inline]
pub fn span_all_columns(mut self, value: bool) -> Self {
self.flags.set(SelectableFlags::SPAN_ALL_COLUMNS, value);
self
@ -74,7 +96,6 @@ impl<T: AsRef<str>> Selectable<T> {
/// Enables/disables click event generation on double clicks.
///
/// Default: disabled
#[inline]
pub fn allow_double_click(mut self, value: bool) -> Self {
self.flags.set(SelectableFlags::ALLOW_DOUBLE_CLICK, value);
self
@ -84,7 +105,6 @@ impl<T: AsRef<str>> Selectable<T> {
/// When disabled, it cannot be selected and the text uses the disabled text color.
///
/// Default: disabled
#[inline]
pub fn disabled(mut self, value: bool) -> Self {
self.flags.set(SelectableFlags::DISABLED, value);
self
@ -100,18 +120,18 @@ impl<T: AsRef<str>> Selectable<T> {
///
/// - `> 0.0`: use given height
/// - `= 0.0`: use label height
#[inline]
pub fn size(mut self, size: impl Into<MintVec2>) -> Self {
self.size = size.into().into();
self
}
/// Builds the selectable.
///
/// Returns true if the selectable was clicked.
pub fn build(self, ui: &Ui) -> bool {
pub fn build(self) -> bool {
unsafe {
sys::igSelectable_Bool(
ui.scratch_txt(self.label),
self.ui.scratch_txt(self.label),
self.selected,
self.flags.bits() as i32,
self.size.into(),
@ -120,8 +140,8 @@ impl<T: AsRef<str>> Selectable<T> {
}
/// Builds the selectable using a mutable reference to selected state.
pub fn build_with_ref(self, ui: &Ui, selected: &mut bool) -> bool {
if self.selected(*selected).build(ui) {
pub fn build_with_ref(self, selected: &mut bool) -> bool {
if self.selected(*selected).build() {
*selected = !*selected;
true
} else {