egui_extras: make number of rows in table demo configurable

This commit is contained in:
Wayne Warren 2022-04-03 10:59:10 -06:00
parent e81a92d32d
commit ab4930fde7
2 changed files with 26 additions and 10 deletions

View file

@ -5,8 +5,9 @@ use egui_extras::{Size, StripBuilder, TableBuilder, TableRow, TableRowBuilder};
#[cfg_attr(feature = "serde", derive(serde::Deserialize, serde::Serialize))] #[cfg_attr(feature = "serde", derive(serde::Deserialize, serde::Serialize))]
#[derive(Default)] #[derive(Default)]
pub struct TableDemo { pub struct TableDemo {
virtual_scroll: bool, heterogeneous_rows: bool,
resizable: bool, resizable: bool,
num_rows: usize,
} }
impl super::Demo for TableDemo { impl super::Demo for TableDemo {
@ -28,14 +29,29 @@ impl super::Demo for TableDemo {
impl super::View for TableDemo { impl super::View for TableDemo {
fn ui(&mut self, ui: &mut egui::Ui) { fn ui(&mut self, ui: &mut egui::Ui) {
ui.checkbox(&mut self.virtual_scroll, "Virtual scroll");
ui.checkbox(&mut self.resizable, "Resizable columns");
// Leave room for the source code link after the table demo: // Leave room for the source code link after the table demo:
StripBuilder::new(ui) StripBuilder::new(ui)
.size(Size::exact(50.0)) // for the settings
.size(Size::remainder()) // for the table .size(Size::remainder()) // for the table
.size(Size::exact(10.0)) // for the source code link .size(Size::exact(10.0)) // for the source code link
.vertical(|mut strip| { .vertical(|mut strip| {
strip.cell(|ui| {
StripBuilder::new(ui)
.size(Size::exact(150.0))
.size(Size::remainder())
.horizontal(|mut strip| {
strip.cell(|ui| {
ui.checkbox(&mut self.heterogeneous_rows, "Heterogeneous rows");
ui.checkbox(&mut self.resizable, "Resizable columns");
});
strip.cell(|ui| {
ui.add(
egui::Slider::new(&mut self.num_rows, 0..=300_000)
.text("Num rows"),
);
});
});
});
strip.cell(|ui| { strip.cell(|ui| {
self.table_ui(ui); self.table_ui(ui);
}); });
@ -76,8 +92,8 @@ impl TableDemo {
}); });
}) })
.body(|body| { .body(|body| {
if self.virtual_scroll { if !self.heterogeneous_rows {
body.rows(text_height, 100_000, |row_index, mut row| { body.rows(text_height, self.num_rows, |row_index, mut row| {
row.col(|ui| { row.col(|ui| {
ui.label(row_index.to_string()); ui.label(row_index.to_string());
}); });
@ -92,9 +108,9 @@ impl TableDemo {
}); });
} else { } else {
let row_builder = DemoRowBuilder { let row_builder = DemoRowBuilder {
row_count: 100000, row_count: self.num_rows,
}; };
body.heterogenous_rows(row_builder); body.heterogeneous_rows(row_builder);
} }
}); });
} }

View file

@ -357,7 +357,7 @@ pub trait TableRowBuilder {
} }
impl<'a> TableBody<'a> { impl<'a> TableBody<'a> {
pub fn heterogenous_rows(mut self, builder: impl TableRowBuilder) { pub fn heterogeneous_rows(mut self, builder: impl TableRowBuilder) {
let mut heights = builder.row_heights(&self.widths); let mut heights = builder.row_heights(&self.widths);
let max_height = self.end_y - self.start_y; let max_height = self.end_y - self.start_y;