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

demo tweaks

Browse source
This commit is contained in:
Emil Ernerfeldt 2021-01-02 12:00:14 +01:00
parent 4e3251c300
commit 1690db0f0c
3 changed files with 20 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
egui/src/paint/stats.rs
View file

@ -129,6 +129,10 @@ impl AllocInfo {
) )
} }
} }
pub fn label(&self, ui: &mut crate::Ui, what: &str) -> crate::Response {
ui.add(crate::Label::new(self.format(what)).multiline(false))
}
} }
#[derive(Clone, Copy, Default)] #[derive(Clone, Copy, Default)]
@ -226,19 +230,21 @@ impl PaintStats {
} = self; } = self;
ui.label("Intermediate:"); ui.label("Intermediate:");
ui.label(primitives.format("primitives")) primitives
.label(ui, "primitives")
.on_hover_text("Boxes, circles, etc"); .on_hover_text("Boxes, circles, etc");
ui.label(cmd_text.format("text")); cmd_text.label(ui, "text");
ui.label(cmd_path.format("paths")); cmd_path.label(ui, "paths");
ui.label(cmd_mesh.format("meshes")); cmd_mesh.label(ui, "meshes");
ui.label(cmd_vec.format("nested")); cmd_vec.label(ui, "nested");
ui.advance_cursor(10.0); ui.advance_cursor(10.0);
ui.label("Tessellated:"); ui.label("Tessellated:");
ui.label(jobs.format("jobs")) jobs.label(ui, "jobs")
.on_hover_text("Number of separate clip rectangles"); .on_hover_text("Number of separate clip rectangles");
ui.label(vertices.format("vertices")); vertices.label(ui, "vertices");
ui.label(indices.format("indices")) indices
.label(ui, "indices")
.on_hover_text("Three 32-bit indices per triangles"); .on_hover_text("Three 32-bit indices per triangles");
ui.advance_cursor(10.0); ui.advance_cursor(10.0);

1
egui_demo_lib/src/apps/demo/demo_windows.rs
View file

@ -108,6 +108,7 @@ impl DemoWindows {
Window::new("🔧 Settings") Window::new("🔧 Settings")
.open(&mut open_windows.settings) .open(&mut open_windows.settings)
.scroll(true)
.show(ctx, |ui| { .show(ctx, |ui| {
ctx.settings_ui(ui); ctx.settings_ui(ui);
}); });

10
egui_demo_lib/src/wrap_app.rs
View file

@ -92,7 +92,7 @@ impl epi::App for WrapApp {
self.backend_panel.update(ctx, frame); self.backend_panel.update(ctx, frame);
if self.backend_panel.open { if self.backend_panel.open {
egui::SidePanel::left("backend_panel", 0.0).show(ctx, |ui| { egui::SidePanel::left("backend_panel", 150.0).show(ctx, |ui| {
self.backend_panel.ui(ui, frame); self.backend_panel.ui(ui, frame);
}); });
} }
@ -190,9 +190,9 @@ impl BackendPanel {
} }
fn ui(&mut self, ui: &mut egui::Ui, frame: &mut epi::Frame<'_>) { fn ui(&mut self, ui: &mut egui::Ui, frame: &mut epi::Frame<'_>) {
let is_web = frame.is_web(); ui.heading("💻 Backend");
if is_web { if frame.is_web() {
ui.label("Egui is an immediate mode GUI written in Rust, compiled to WebAssembly, rendered with WebGL."); ui.label("Egui is an immediate mode GUI written in Rust, compiled to WebAssembly, rendered with WebGL.");
ui.label( ui.label(
"Everything you see is rendered as textured triangles. There is no DOM. There are no HTML elements. \ "Everything you see is rendered as textured triangles. There is no DOM. There are no HTML elements. \
@ -211,7 +211,7 @@ impl BackendPanel {
self.frame_history.ui(ui); self.frame_history.ui(ui);
if !is_web { if !frame.is_web() {
// web browsers have their own way of zooming, which egui_web respects // web browsers have their own way of zooming, which egui_web respects
ui.separator(); ui.separator();
if let Some(new_pixels_per_point) = self.pixels_per_point_ui(ui, frame.info()) { if let Some(new_pixels_per_point) = self.pixels_per_point_ui(ui, frame.info()) {
@ -219,7 +219,7 @@ impl BackendPanel {
} }
} }
if !is_web { if !frame.is_web() {
ui.separator(); ui.separator();
if ui if ui
.button("📱 Phone Size") .button("📱 Phone Size")