From ef4f0908f255f1093304f601ab4b4e1b2e84edcf Mon Sep 17 00:00:00 2001 From: Emil Ernerfeldt Date: Mon, 21 Jan 2019 01:48:32 -0600 Subject: [PATCH] make label into a macro --- emigui/src/emigui.rs | 32 +++++++++++---- emigui/src/layout.rs | 8 ++-- emigui/src/widgets.rs | 9 ++-- emigui_wasm/src/app.rs | 88 ++++++++++++++++------------------------ emigui_wasm/src/lib.rs | 8 ++-- emigui_wasm/src/webgl.rs | 4 +- 6 files changed, 75 insertions(+), 74 deletions(-) diff --git a/emigui/src/emigui.rs b/emigui/src/emigui.rs index 0a3690db..13e5fdbe 100644 --- a/emigui/src/emigui.rs +++ b/emigui/src/emigui.rs @@ -1,7 +1,7 @@ use std::sync::Arc; use crate::{ - layout, + label, layout, layout::{show_popup, LayoutOptions, Region}, math::{clamp, remap_clamp, vec2}, mesher::Vertex, @@ -47,10 +47,11 @@ fn show_font_sizes(font_sizes: &mut FontSizes, gui: &mut Region) { } fn show_font_texture(texture: &Texture, gui: &mut Region) { - gui.add(label(format!( + gui.add(label!( "Font texture size: {} x {} (hover to zoom)", - texture.width, texture.height - ))); + texture.width, + texture.height + )); let mut size = vec2(texture.width as f32, texture.height as f32); if size.x > gui.width() { size *= gui.width() / size.x; @@ -192,11 +193,24 @@ impl Emigui { }); region.foldable("Stats", |gui| { - gui.add(label(format!("num_vertices: {}", self.stats.num_vertices))); - gui.add(label(format!( - "num_triangles: {}", - self.stats.num_triangles - ))); + gui.add(label!( + "Screen size: {} x {} points, pixels_per_point: {}", + gui.input().screen_size.x, + gui.input().screen_size.y, + gui.input().pixels_per_point, + )); + gui.add(label!( + "mouse_pos: {} x {}", + gui.input().mouse_pos.x, + gui.input().mouse_pos.y, + )); + gui.add(label!( + "gui cursor: {} x {}", + gui.cursor().x, + gui.cursor().y, + )); + gui.add(label!("num_vertices: {}", self.stats.num_vertices)); + gui.add(label!("num_triangles: {}", self.stats.num_triangles)); }); } } diff --git a/emigui/src/layout.rs b/emigui/src/layout.rs index 3a3cbb6a..3706d018 100644 --- a/emigui/src/layout.rs +++ b/emigui/src/layout.rs @@ -9,7 +9,7 @@ use crate::{ fonts::{Fonts, TextStyle}, math::*, types::*, - widgets::{label, Widget}, + widgets::{Label, Widget}, }; // ---------------------------------------------------------------------------- @@ -85,7 +85,7 @@ impl GuiResponse { /// Show this text if the item was hovered pub fn tooltip_text>(&mut self, text: S) -> &mut Self { self.tooltip(|popup| { - popup.add(label(text)); + popup.add(Label::new(text)); }) } } @@ -437,8 +437,8 @@ impl Region { /// Temporarily split split a vertical layout into several columns. /// /// region.columns(2, |columns| { - /// columns[0].add(emigui::widgets::label("First column")); - /// columns[1].add(emigui::widgets::label("Second column")); + /// columns[0].add(emigui::widgets::label!("First column")); + /// columns[1].add(emigui::widgets::label!("Second column")); /// }); pub fn columns(&mut self, num_columns: usize, add_contents: F) -> R where diff --git a/emigui/src/widgets.rs b/emigui/src/widgets.rs index c2186753..9654f86e 100644 --- a/emigui/src/widgets.rs +++ b/emigui/src/widgets.rs @@ -40,8 +40,11 @@ impl Label { } } -pub fn label>(text: S) -> Label { - Label::new(text) +/// Usage: label!("Foo: {}", bar) +#[macro_export] +macro_rules! label { + ($fmt:expr) => (Label::new($fmt)); + ($fmt:expr, $($arg:tt)*) => (Label::new(format!($fmt, $($arg)*))); } impl Widget for Label { @@ -264,7 +267,7 @@ impl<'a> Widget for Slider<'a> { columns[1].available_space.y = response.rect.size().y; columns[1].horizontal(Align::Center, |region| { - region.add(label(full_text)); + region.add(Label::new(full_text)); }); response diff --git a/emigui_wasm/src/app.rs b/emigui_wasm/src/app.rs index 659f42a8..418bb541 100644 --- a/emigui_wasm/src/app.rs +++ b/emigui_wasm/src/app.rs @@ -1,4 +1,4 @@ -use emigui::{math::*, types::*, widgets::*, Align, Region, TextStyle}; +use emigui::{label, math::*, types::*, widgets::*, Align, Region, TextStyle}; pub struct App { checked: bool, @@ -25,62 +25,46 @@ impl Default for App { impl App { pub fn show_gui(&mut self, gui: &mut Region) { - gui.add(label("Emigui").text_style(TextStyle::Heading)); - gui.add(label("Emigui is an Immediate mode GUI written in Rust, compiled to WebAssembly, rendered with WebGL.")); + gui.add(label!("Emigui").text_style(TextStyle::Heading)); + gui.add(label!("Emigui is an Immediate mode GUI written in Rust, compiled to WebAssembly, rendered with WebGL.")); gui.add(Separator::new()); - gui.add(label(format!( - "Screen size: {} x {}, pixels_per_point: {}", - gui.input().screen_size.x, - gui.input().screen_size.y, - gui.input().pixels_per_point, - ))); - gui.add(label(format!( - "mouse_pos: {} x {}", - gui.input().mouse_pos.x, - gui.input().mouse_pos.y, - ))); - gui.add(label(format!( - "gui cursor: {} x {}", - gui.cursor().x, - gui.cursor().y, - ))); + gui.foldable("Widget examples", |gui| { + gui.horizontal(Align::Min, |gui| { + gui.add(label!("Text can have").text_color(srgba(110, 255, 110, 255))); + gui.add(label!("color").text_color(srgba(128, 140, 255, 255))); + gui.add(label!("and tooltips (hover me)")).tooltip_text( + "This is a multiline tooltip that demonstrates that you can easily add tooltips to any element.\nThis is the second line.\nThis is the third.", + ); + }); - gui.horizontal(Align::Min, |gui| { - gui.add(label("Text can have").text_color(srgba(110, 255, 110, 255))); - gui.add(label("color").text_color(srgba(128, 140, 255, 255))); - }); + gui.add(Checkbox::new(&mut self.checked, "checkbox")); - gui.add(label("Hover me")).tooltip_text( - "This is a multiline tooltip that demonstrates that you can easily add tooltips to any element.\nThis is the second line.\nThis is the third.", - ); + gui.horizontal(Align::Min, |gui| { + if gui.add(radio(self.radio == 0, "First")).clicked { + self.radio = 0; + } + if gui.add(radio(self.radio == 1, "Second")).clicked { + self.radio = 1; + } + if gui.add(radio(self.radio == 2, "Final")).clicked { + self.radio = 2; + } + }); - gui.add(Checkbox::new(&mut self.checked, "checkbox")); - - gui.horizontal(Align::Min, |gui| { - if gui.add(radio(self.radio == 0, "First")).clicked { - self.radio = 0; - } - if gui.add(radio(self.radio == 1, "Second")).clicked { - self.radio = 1; - } - if gui.add(radio(self.radio == 2, "Final")).clicked { - self.radio = 2; - } - }); - - gui.horizontal(Align::Min, |gui| { - if gui - .add(Button::new("Click me")) - .tooltip_text("This will just increase a counter.") - .clicked - { - self.count += 1; - } - gui.add(label(format!( - "The button have been clicked {} times", - self.count - ))); + gui.horizontal(Align::Min, |gui| { + if gui + .add(Button::new("Click me")) + .tooltip_text("This will just increase a counter.") + .clicked + { + self.count += 1; + } + gui.add(label!( + "The button have been clicked {} times", + self.count + )); + }); }); gui.foldable("Test box rendering", |gui| { diff --git a/emigui_wasm/src/lib.rs b/emigui_wasm/src/lib.rs index 7a88676d..a577989a 100644 --- a/emigui_wasm/src/lib.rs +++ b/emigui_wasm/src/lib.rs @@ -5,7 +5,7 @@ extern crate wasm_bindgen; extern crate emigui; -use emigui::{widgets::label, Align, Emigui, RawInput}; +use emigui::{label, widgets::Label, Align, Emigui, RawInput}; use wasm_bindgen::prelude::*; @@ -48,12 +48,12 @@ impl State { self.app.show_gui(&mut region); self.emigui.example(&mut region); - region.add(label("WebGl painter info:")); + region.add(label!("WebGl painter info:")); region.indent(|region| { - region.add(label(self.webgl_painter.debug_info())); + region.add(label!(self.webgl_painter.debug_info())); }); - region.add(label(format!("Everything: {:.1} ms", self.everything_ms))); + region.add(label!("Everything: {:.1} ms", self.everything_ms)); let frame = self.emigui.paint(); let result = diff --git a/emigui_wasm/src/webgl.rs b/emigui_wasm/src/webgl.rs index 33fdb58a..5f51c828 100644 --- a/emigui_wasm/src/webgl.rs +++ b/emigui_wasm/src/webgl.rs @@ -49,8 +49,8 @@ impl Painter { gl.bind_texture(Gl::TEXTURE_2D, Some(&gl_texture)); gl.tex_parameteri(Gl::TEXTURE_2D, Gl::TEXTURE_WRAP_S, Gl::CLAMP_TO_EDGE as i32); gl.tex_parameteri(Gl::TEXTURE_2D, Gl::TEXTURE_WRAP_T, Gl::CLAMP_TO_EDGE as i32); - gl.tex_parameteri(Gl::TEXTURE_2D, Gl::TEXTURE_MIN_FILTER, Gl::NEAREST as i32); - gl.tex_parameteri(Gl::TEXTURE_2D, Gl::TEXTURE_MAG_FILTER, Gl::NEAREST as i32); + gl.tex_parameteri(Gl::TEXTURE_2D, Gl::TEXTURE_MIN_FILTER, Gl::LINEAR as i32); + gl.tex_parameteri(Gl::TEXTURE_2D, Gl::TEXTURE_MAG_FILTER, Gl::LINEAR as i32); // --------------------------------------------------------------------