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

[grid] Set default row height to interact_size.y

Browse source 
It is what we use for horizontal layouts, and makes sense.
This commit is contained in:
Emil Ernerfeldt 2021-01-15 19:40:12 +01:00
parent 03c9cda89b
commit 480c6db37f
2 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
egui/src/grid.rs
View file

@ -67,7 +67,7 @@ impl GridLayout {
spacing: ui.style().spacing.item_spacing, spacing: ui.style().spacing.item_spacing,
striped: false, striped: false,
initial_x: ui.cursor().x, initial_x: ui.cursor().x,
min_row_height: 0.0, min_row_height: ui.style().spacing.interact_size.y,
col: 0, col: 0,
row: 0, row: 0,
} }
@ -173,7 +173,7 @@ impl GridLayout {
pub struct Grid { pub struct Grid {
id_source: Id, id_source: Id,
striped: bool, striped: bool,
min_row_height: f32, min_row_height: Option<f32>,
} }
impl Grid { impl Grid {
@ -181,7 +181,7 @@ impl Grid {
Self { Self {
id_source: Id::new(id_source), id_source: Id::new(id_source),
striped: false, striped: false,
min_row_height: 0.0, min_row_height: None,
} }
} }
@ -194,9 +194,9 @@ impl Grid {
self self
} }
/// Set minimum height of each row. Default: 0. /// Set minimum height of each row. Default: [`Spacing::interact_size.y`].
pub fn min_row_height(mut self, min_row_height: f32) -> Self { pub fn min_row_height(mut self, min_row_height: f32) -> Self {
self.min_row_height = min_row_height; self.min_row_height = Some(min_row_height);
self self
} }
} }
@ -208,6 +208,7 @@ impl Grid {
striped, striped,
min_row_height, min_row_height,
} = self; } = self;
let min_row_height = min_row_height.unwrap_or_else(|| ui.style().spacing.interact_size.y);
// Each grid cell is aligned LEFT_CENTER. // Each grid cell is aligned LEFT_CENTER.
// If somebody wants to wrap more things inside a cell, // If somebody wants to wrap more things inside a cell,

4
egui_demo_lib/src/apps/demo/widget_gallery.rs
View file

@ -54,9 +54,7 @@ impl super::View for WidgetGallery {
color, color,
} = self; } = self;
let grid = egui::Grid::new("my_grid") let grid = egui::Grid::new("my_grid").striped(true);
.striped(true)
.min_row_height(ui.style().spacing.interact_size.y);
grid.show(ui, |ui| { grid.show(ui, |ui| {
ui.label("Label:"); ui.label("Label:");
ui.label("Welcome to the widget gallery!"); ui.label("Welcome to the widget gallery!");