migrations/egui
1
0
Fork 0
mirror of https://github.com/emilk/egui.git synced 2026-08-30 21:30:03 -04:00
Code Activity

Rename grid to strip.

Browse Source 
Easier documentation/naming of cell direction.
Add doc comments for public structs.
This commit is contained in:
René Rössler
2022-03-15 10:09:19 +01:00
parent 42b6ed6100
commit 6d4e10cf91
10 changed files with 135 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
egui_demo_lib/src/apps/demo/demo_app_windows.rs
View File

@@ -23,13 +23,13 @@ impl Default for Demos {
Box::new(super::dancing_strings::DancingStrings::default()),
Box::new(super::drag_and_drop::DragAndDropDemo::default()),
Box::new(super::font_book::FontBook::default()),
Box::new(super::grid_demo::GridDemo::default()),
Box::new(super::MiscDemoWindow::default()),
Box::new(super::multi_touch::MultiTouch::default()),
Box::new(super::painting::Painting::default()),
Box::new(super::plot_demo::PlotDemo::default()),
Box::new(super::scrolling::Scrolling::default()),
Box::new(super::sliders::Sliders::default()),
Box::new(super::strip_demo::StripDemo::default()),
Box::new(super::table_demo::TableDemo::default()),
Box::new(super::text_edit::TextEdit::default()),
Box::new(super::widget_gallery::WidgetGallery::default()),

2
egui_demo_lib/src/apps/demo/mod.rs
View File

@@ -12,7 +12,6 @@ pub mod dancing_strings;
pub mod demo_app_windows;
pub mod drag_and_drop;
pub mod font_book;
pub mod grid_demo;
pub mod layout_test;
pub mod misc_demo_window;
pub mod multi_touch;
@@ -22,6 +21,7 @@ pub mod password;
pub mod plot_demo;
pub mod scrolling;
pub mod sliders;
pub mod strip_demo;
pub mod table_demo;
pub mod tests;
pub mod text_edit;

50
egui_demo_lib/src/apps/demo/grid_demo.rs → egui_demo_lib/src/apps/demo/strip_demo.rs
View File

@@ -1,14 +1,14 @@
use egui::Color32;
use egui_extras::{GridBuilder, Size};
use egui_extras::{Size, StripBuilder};
/// Shows off a table with dynamic layout
#[cfg_attr(feature = "serde", derive(serde::Deserialize, serde::Serialize))]
#[derive(Default)]
pub struct GridDemo {}
pub struct StripDemo {}
impl super::Demo for GridDemo {
impl super::Demo for StripDemo {
fn name(&self) -> &'static str {
"▣ Grid Demo"
"▣ Strip Demo"
}
fn show(&mut self, ctx: &egui::Context, open: &mut bool) {
@@ -23,9 +23,9 @@ impl super::Demo for GridDemo {
}
}
impl super::View for GridDemo {
impl super::View for StripDemo {
fn ui(&mut self, ui: &mut egui::Ui) {
GridBuilder::new(ui)
StripBuilder::new(ui)
.size(Size::Absolute(50.0))
.size(Size::Remainder)
.size(Size::RelativeMinimum {
@@ -33,15 +33,15 @@ impl super::View for GridDemo {
minimum: 60.0,
})
.size(Size::Absolute(10.0))
.vertical(|mut grid| {
grid.cell(|ui| {
.vertical(|mut strip| {
strip.cell(|ui| {
ui.painter()
.rect_filled(ui.available_rect_before_wrap(), 0.0, Color32::BLUE);
ui.label("Full width and 50px height");
});
grid.grid(|builder| {
builder.sizes(Size::Remainder, 2).horizontal(|mut grid| {
grid.cell(|ui| {
strip.strip(|builder| {
builder.sizes(Size::Remainder, 2).horizontal(|mut strip| {
strip.cell(|ui| {
ui.painter().rect_filled(
ui.available_rect_before_wrap(),
0.0,
@@ -49,10 +49,10 @@ impl super::View for GridDemo {
);
ui.label("remaining height and 50% of the width");
});
grid.grid(|builder| {
builder.sizes(Size::Remainder, 3).vertical(|mut grid| {
grid.empty();
grid.cell(|ui| {
strip.strip(|builder| {
builder.sizes(Size::Remainder, 3).vertical(|mut strip| {
strip.empty();
strip.cell(|ui| {
ui.painter().rect_filled(
ui.available_rect_before_wrap(),
0.0,
@@ -64,22 +64,22 @@ impl super::View for GridDemo {
});
});
});
grid.grid(|builder| {
strip.strip(|builder| {
builder
.size(Size::Remainder)
.size(Size::Absolute(60.0))
.size(Size::Remainder)
.size(Size::Absolute(70.0))
.horizontal(|mut grid| {
grid.empty();
grid.grid(|builder| {
.horizontal(|mut strip| {
strip.empty();
strip.strip(|builder| {
builder
.size(Size::Remainder)
.size(Size::Absolute(60.0))
.size(Size::Remainder)
.vertical(|mut grid| {
grid.empty();
grid.cell(|ui| {
.vertical(|mut strip| {
strip.empty();
strip.cell(|ui| {
ui.painter().rect_filled(
ui.available_rect_before_wrap(),
0.0,
@@ -89,8 +89,8 @@ impl super::View for GridDemo {
});
});
});
grid.empty();
grid.cell(|ui| {
strip.empty();
strip.cell(|ui| {
ui.painter().rect_filled(
ui.available_rect_before_wrap(),
0.0,
@@ -100,7 +100,7 @@ impl super::View for GridDemo {
});
});
});
grid.cell(|ui| {
strip.cell(|ui| {
ui.vertical_centered(|ui| {
ui.add(crate::__egui_github_link_file!());
});

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

@@ -1,5 +1,5 @@
use egui::{Label, Vec2};
use egui_extras::{GridBuilder, Size, TableBuilder};
use egui_extras::{Size, StripBuilder, TableBuilder};
/// Shows off a table with dynamic layout
#[cfg_attr(feature = "serde", derive(serde::Deserialize, serde::Serialize))]
@@ -31,7 +31,7 @@ impl super::View for TableDemo {
// The table is inside a grid as its container would otherwise grow slowly as it takes all available height
ui.spacing_mut().item_spacing = Vec2::splat(4.0);
GridBuilder::new(ui)
StripBuilder::new(ui)
.size(Size::Remainder)
.size(Size::Absolute(10.0))
.vertical(|mut grid| {