migrations/egui
1
0
Fork 0
mirror of https://github.com/emilk/egui.git synced 2026-09-01 06:10:06 -04:00
Code Activity

Table resize (#1438)

Browse Source 
* Let 1D strips fill up parent width/height
* Add Strip + Table + DatePicker to egui_extras changelog
* Expose some dragging- and pointer related context/memory methods
* Make tables resizable
This commit is contained in:
Emil Ernerfeldt
2022-04-01 12:01:00 +02:00
committed by GitHub
parent a52bbade45
commit 21c32a18d8
12 changed files with 323 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
egui_demo_lib/src/apps/demo/strip_demo.rs
View File

@@ -26,13 +26,10 @@ impl super::Demo for StripDemo {
impl super::View for StripDemo {
fn ui(&mut self, ui: &mut egui::Ui) {
StripBuilder::new(ui)
.size(Size::Absolute(50.0))
.size(Size::Remainder)
.size(Size::RelativeMinimum {
relative: 0.5,
minimum: 60.0,
})
.size(Size::Absolute(10.0))
.size(Size::exact(50.0))
.size(Size::remainder())
.size(Size::relative(0.5).at_least(60.0))
.size(Size::exact(10.0))
.vertical(|mut strip| {
strip.cell_clip(|ui| {
ui.painter()
@@ -40,7 +37,7 @@ impl super::View for StripDemo {
ui.label("Full width and 50px height");
});
strip.strip(|builder| {
builder.sizes(Size::Remainder, 2).horizontal(|mut strip| {
builder.sizes(Size::remainder(), 2).horizontal(|mut strip| {
strip.cell_clip(|ui| {
ui.painter().rect_filled(
ui.available_rect_before_wrap(),
@@ -50,7 +47,7 @@ impl super::View for StripDemo {
ui.label("remaining height and 50% of the width");
});
strip.strip(|builder| {
builder.sizes(Size::Remainder, 3).vertical(|mut strip| {
builder.sizes(Size::remainder(), 3).vertical(|mut strip| {
strip.empty();
strip.cell_clip(|ui| {
ui.painter().rect_filled(
@@ -66,17 +63,17 @@ impl super::View for StripDemo {
});
strip.strip(|builder| {
builder
.size(Size::Remainder)
.size(Size::Absolute(60.0))
.size(Size::Remainder)
.size(Size::Absolute(70.0))
.size(Size::remainder())
.size(Size::exact(60.0))
.size(Size::remainder())
.size(Size::exact(70.0))
.horizontal(|mut strip| {
strip.empty();
strip.strip(|builder| {
builder
.size(Size::Remainder)
.size(Size::Absolute(60.0))
.size(Size::Remainder)
.size(Size::remainder())
.size(Size::exact(60.0))
.size(Size::remainder())
.vertical(|mut strip| {
strip.empty();
strip.cell_clip(|ui| {

50
egui_demo_lib/src/apps/demo/table_demo.rs
View File

@@ -5,6 +5,7 @@ use egui_extras::{Size, StripBuilder, TableBuilder};
#[derive(Default)]
pub struct TableDemo {
virtual_scroll: bool,
resizable: bool,
}
impl super::Demo for TableDemo {
@@ -26,12 +27,13 @@ impl super::Demo for TableDemo {
impl super::View for TableDemo {
fn ui(&mut self, ui: &mut egui::Ui) {
ui.checkbox(&mut self.virtual_scroll, "Virtual scroll demo");
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:
StripBuilder::new(ui)
.size(Size::Remainder) // for the table
.size(Size::Absolute(10.0)) // for the source code link
.size(Size::remainder()) // for the table
.size(Size::exact(10.0)) // for the source code link
.vertical(|mut strip| {
strip.cell_clip(|ui| {
self.table_ui(ui);
@@ -49,24 +51,25 @@ impl TableDemo {
fn table_ui(&mut self, ui: &mut egui::Ui) {
TableBuilder::new(ui)
.striped(true)
.column(Size::Absolute(120.0))
.column(Size::RemainderMinimum(180.0))
.column(Size::Absolute(100.0))
.column(Size::initial(60.0).at_least(40.0))
.column(Size::remainder().at_least(60.0))
.column(Size::initial(60.0).at_least(40.0))
.resizable(self.resizable)
.header(20.0, |mut header| {
header.col(|ui| {
header.col_clip(|ui| {
ui.heading("Left");
});
header.col(|ui| {
header.col_clip(|ui| {
ui.heading("Middle");
});
header.col(|ui| {
header.col_clip(|ui| {
ui.heading("Right");
});
})
.body(|mut body| {
if self.virtual_scroll {
body.rows(20.0, 100_000, |index, mut row| {
row.col(|ui| {
row.col_clip(|ui| {
ui.label(index.to_string());
});
row.col_clip(|ui| {
@@ -75,30 +78,27 @@ impl TableDemo {
.wrap(false),
);
});
row.col(|ui| {
row.col_clip(|ui| {
ui.label(index.to_string());
});
});
} else {
for i in 0..100 {
let height = match i % 8 {
0 => 25.0,
4 => 30.0,
_ => 20.0,
};
for i in 0..20 {
let thick = i % 4 == 0;
let height = if thick { 25.0 } else { 15.0 };
body.row(height, |mut row| {
row.col(|ui| {
row.col_clip(|ui| {
ui.label(i.to_string());
});
row.col_clip(|ui| {
ui.add(
egui::Label::new(
format!("Normal scroll, each row can have a different height. Height: {}", height),
)
.wrap(false),
);
ui.style_mut().wrap = Some(false);
if thick {
ui.heading("Extra thick row");
} else {
ui.label("Normal row");
}
});
row.col(|ui| {
row.col_clip(|ui| {
ui.label(i.to_string());
});
});