From 48a8553661510b1de9e6f101d7c87970200da6ae Mon Sep 17 00:00:00 2001 From: Emil Ernerfeldt Date: Sat, 12 Dec 2020 19:43:12 +0100 Subject: [PATCH] Sprinkle demo app with emojis --- egui/src/context.rs | 10 ++++----- egui/src/demos/app.rs | 4 ++-- egui/src/demos/dancing_strings.rs | 2 +- egui/src/demos/demo_windows.rs | 34 ++++++++++++++++--------------- egui/src/demos/drag_and_drop.rs | 2 +- egui/src/demos/fractal_clock.rs | 2 +- egui/src/demos/mod.rs | 2 +- egui/src/demos/tests.rs | 2 +- egui/src/input.rs | 2 +- egui/src/painter.rs | 5 ++--- egui/src/style.rs | 6 +++--- 11 files changed, 36 insertions(+), 35 deletions(-) diff --git a/egui/src/context.rs b/egui/src/context.rs index e938c140..470e3677 100644 --- a/egui/src/context.rs +++ b/egui/src/context.rs @@ -587,13 +587,13 @@ impl Context { pub fn settings_ui(&self, ui: &mut Ui) { use crate::containers::*; - CollapsingHeader::new("Style") + CollapsingHeader::new("πŸŽ‘ Style") .default_open(true) .show(ui, |ui| { self.style_ui(ui); }); - CollapsingHeader::new("Fonts") + CollapsingHeader::new("πŸ”  Fonts") .default_open(false) .show(ui, |ui| { let mut font_definitions = self.fonts().definitions().clone(); @@ -602,7 +602,7 @@ impl Context { self.set_fonts(font_definitions); }); - CollapsingHeader::new("Painting") + CollapsingHeader::new("βœ’ Painting") .default_open(true) .show(ui, |ui| { let mut tesselation_options = self.options.lock().tesselation_options; @@ -625,11 +625,11 @@ impl Context { .on_hover_text("Is Egui currently listening for text input"); ui.advance_cursor(16.0); - CollapsingHeader::new("Input") + CollapsingHeader::new("πŸ“₯ Input") .default_open(false) .show(ui, |ui| ui.input().clone().ui(ui)); - CollapsingHeader::new("Paint stats") + CollapsingHeader::new("πŸ“Š Paint stats") .default_open(true) .show(ui, |ui| { self.paint_stats.lock().ui(ui); diff --git a/egui/src/demos/app.rs b/egui/src/demos/app.rs index 3c9fcf61..1f8481ac 100644 --- a/egui/src/demos/app.rs +++ b/egui/src/demos/app.rs @@ -89,7 +89,7 @@ impl FrameHistory { ); crate::demos::warn_if_debug_build(ui); - crate::CollapsingHeader::new("CPU usage history") + crate::CollapsingHeader::new("πŸ“Š CPU usage history") .default_open(false) .show(ui, |ui| { self.graph(ui); @@ -304,7 +304,7 @@ impl app::App for DemoApp { &mut integration_context.tex_allocator, ); - crate::Window::new("Backend") + crate::Window::new("πŸ’» Backend") .min_width(360.0) .scroll(false) .show(ctx, |ui| { diff --git a/egui/src/demos/dancing_strings.rs b/egui/src/demos/dancing_strings.rs index f699c2c3..19e48302 100644 --- a/egui/src/demos/dancing_strings.rs +++ b/egui/src/demos/dancing_strings.rs @@ -14,7 +14,7 @@ impl Default for DancingStrings { impl Demo for DancingStrings { fn name(&self) -> &str { - "Dancing Strings" + "β™« Dancing Strings" } fn show(&mut self, ctx: &Arc, open: &mut bool) { diff --git a/egui/src/demos/demo_windows.rs b/egui/src/demos/demo_windows.rs index 03121777..fe7b5ba3 100644 --- a/egui/src/demos/demo_windows.rs +++ b/egui/src/demos/demo_windows.rs @@ -103,10 +103,12 @@ impl DemoWindows { } crate::SidePanel::left(Id::new("side_panel"), 200.0).show(ctx, |ui| { - ui.heading("Egui Demo"); + ui.heading("βœ’ Egui Demo"); crate::demos::warn_if_debug_build(ui); ui.label("Egui is an immediate mode GUI library written in Rust."); - ui.add(crate::Hyperlink::new("https://github.com/emilk/egui").text("Egui home page")); + ui.add(crate::Hyperlink::new("https://github.com/emilk/egui").text(" Egui home page")); + + ui.label("Egui can be run on the web, or natively on 🐧"); ui.separator(); ui.label( @@ -117,7 +119,7 @@ impl DemoWindows { } ui.separator(); - ui.heading("Windows:"); + ui.heading("οΌ³ Windows:"); ui.indent("windows", |ui| { self.open_windows.checkboxes(ui); self.demos.checkboxes(ui); @@ -147,34 +149,34 @@ impl DemoWindows { .. } = self; - Window::new("Demo") + Window::new("✨ Demo") .open(&mut open_windows.demo) .scroll(true) .show(ctx, |ui| { demo_window.ui(ui); }); - Window::new("Settings") + Window::new("πŸ”§ Settings") .open(&mut open_windows.settings) .show(ctx, |ui| { ctx.settings_ui(ui); }); - Window::new("Inspection") + Window::new("πŸ” Inspection") .open(&mut open_windows.inspection) .scroll(true) .show(ctx, |ui| { ctx.inspection_ui(ui); }); - Window::new("Memory") + Window::new("πŸ“ Memory") .open(&mut open_windows.memory) .resizable(false) .show(ctx, |ui| { ctx.memory_ui(ui); }); - Window::new("Color Test") + Window::new("🎨 Color Test") .default_size([800.0, 1024.0]) .scroll(true) .open(&mut open_windows.color_test) @@ -299,18 +301,18 @@ impl OpenWindows { color_test, } = self; ui.label("Egui:"); - ui.checkbox(settings, "Settings"); - ui.checkbox(inspection, "Inspection"); - ui.checkbox(memory, "Memory"); + ui.checkbox(settings, "πŸ”§ Settings"); + ui.checkbox(inspection, "πŸ” Inspection"); + ui.checkbox(memory, "πŸ“ Memory"); ui.separator(); - ui.checkbox(demo, "Demo"); + ui.checkbox(demo, "✨ Demo"); ui.separator(); - ui.checkbox(resize, "Resize examples"); - ui.checkbox(color_test, "Color test") + ui.checkbox(resize, "↔ Resize examples"); + ui.checkbox(color_test, "🎨 Color test") .on_hover_text("For testing the integrations painter"); ui.separator(); ui.label("Misc:"); - ui.checkbox(fractal_clock, "Fractal Clock"); + ui.checkbox(fractal_clock, "πŸ•‘ Fractal Clock"); } } @@ -333,7 +335,7 @@ fn show_menu_bar(ui: &mut Ui, windows: &mut OpenWindows, seconds_since_midnight: menu::menu(ui, "Windows", |ui| windows.checkboxes(ui)); menu::menu(ui, "About", |ui| { ui.label("This is Egui"); - ui.add(Hyperlink::new("https://github.com/emilk/egui").text("Egui home page")); + ui.add(Hyperlink::new("https://github.com/emilk/egui").text(" Egui home page")); }); if let Some(time) = seconds_since_midnight { diff --git a/egui/src/demos/drag_and_drop.rs b/egui/src/demos/drag_and_drop.rs index 162e7dff..d7b4efdd 100644 --- a/egui/src/demos/drag_and_drop.rs +++ b/egui/src/demos/drag_and_drop.rs @@ -97,7 +97,7 @@ impl Default for DragAndDropDemo { impl Demo for DragAndDropDemo { fn name(&self) -> &str { - "Drag and Drop" + "βœ‹ Drag and Drop" } fn show(&mut self, ctx: &std::sync::Arc, open: &mut bool) { diff --git a/egui/src/demos/fractal_clock.rs b/egui/src/demos/fractal_clock.rs index 573d3a13..22035b71 100644 --- a/egui/src/demos/fractal_clock.rs +++ b/egui/src/demos/fractal_clock.rs @@ -37,7 +37,7 @@ impl FractalClock { open: &mut bool, seconds_since_midnight: Option, ) { - Window::new("FractalClock") + Window::new("πŸ•‘ Fractal Clock") .open(open) .default_size(vec2(512.0, 512.0)) .scroll(false) diff --git a/egui/src/demos/mod.rs b/egui/src/demos/mod.rs index d2040d32..318c8a04 100644 --- a/egui/src/demos/mod.rs +++ b/egui/src/demos/mod.rs @@ -45,7 +45,7 @@ pub trait Demo { pub fn warn_if_debug_build(ui: &mut crate::Ui) { if crate::has_debug_assertions() { ui.label( - crate::Label::new("[Debug build]") + crate::Label::new("β€Ό Debug build β€Ό") .small() .text_color(crate::color::RED), ) diff --git a/egui/src/demos/tests.rs b/egui/src/demos/tests.rs index 09d2de36..45cd60ad 100644 --- a/egui/src/demos/tests.rs +++ b/egui/src/demos/tests.rs @@ -5,7 +5,7 @@ pub struct Tests {} impl demos::Demo for Tests { fn name(&self) -> &str { - "Tests" + "πŸ“‹ Tests" } fn show(&mut self, ctx: &std::sync::Arc, open: &mut bool) { diff --git a/egui/src/input.rs b/egui/src/input.rs index ff987310..5dd19bb0 100644 --- a/egui/src/input.rs +++ b/egui/src/input.rs @@ -410,7 +410,7 @@ impl InputState { ui.style_mut().body_text_style = crate::paint::TextStyle::Monospace; ui.collapsing("Raw Input", |ui| raw.ui(ui)); - crate::containers::CollapsingHeader::new("mouse") + crate::containers::CollapsingHeader::new("πŸ–± Mouse") .default_open(true) .show(ui, |ui| { mouse.ui(ui); diff --git a/egui/src/painter.rs b/egui/src/painter.rs index 67fec0ef..532f841b 100644 --- a/egui/src/painter.rs +++ b/egui/src/painter.rs @@ -139,11 +139,10 @@ impl Painter { self.text(rect.min, LEFT_TOP, text.into(), text_style, color); } - pub fn error(&self, pos: Pos2, text: impl Into) { - let text = text.into(); + pub fn error(&self, pos: Pos2, text: impl std::fmt::Display) { let text_style = TextStyle::Monospace; let font = &self.fonts()[text_style]; - let galley = font.layout_multiline(text, f32::INFINITY); + let galley = font.layout_multiline(format!("πŸ”₯ {}", text), f32::INFINITY); let rect = anchor_rect(Rect::from_min_size(pos, galley.size), LEFT_TOP); self.add(PaintCmd::Rect { rect: rect.expand(2.0), diff --git a/egui/src/style.rs b/egui/src/style.rs index d95d13d8..9dc04ad1 100644 --- a/egui/src/style.rs +++ b/egui/src/style.rs @@ -355,9 +355,9 @@ impl Style { ui.radio_value(body_text_style, value, format!("{:?}", value)); } }); - ui.collapsing("Spacing", |ui| spacing.ui(ui)); - ui.collapsing("Interaction", |ui| interaction.ui(ui)); - ui.collapsing("Visuals", |ui| visuals.ui(ui)); + ui.collapsing("πŸ“ Spacing", |ui| spacing.ui(ui)); + ui.collapsing("☝ Interaction", |ui| interaction.ui(ui)); + ui.collapsing("🎨 Visuals", |ui| visuals.ui(ui)); ui.add(Slider::f32(animation_time, 0.0..=1.0).text("animation_time")); } }