From 6f699b339116eac74045928ac7dc2454a9267858 Mon Sep 17 00:00:00 2001 From: Emil Ernerfeldt Date: Wed, 13 Oct 2021 11:52:34 +0200 Subject: [PATCH] =?UTF-8?q?Replace=20every=20...=20with=20=E2=80=A6=20like?= =?UTF-8?q?=20some=20sort=20of=20crazy=20person?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Also fix some small typos Closes https://github.com/emilk/egui/pull/736 --- .github/ISSUE_TEMPLATE/bug_report.md | 6 +++--- .github/ISSUE_TEMPLATE/feature_request.md | 2 +- CHANGELOG.md | 8 ++++---- README.md | 2 +- egui-winit/src/lib.rs | 2 +- egui/src/any/mod.rs | 2 +- egui/src/containers/window.rs | 4 ++-- egui/src/data/input.rs | 4 ++-- egui/src/menu.rs | 2 +- egui/src/sense.rs | 4 ++-- egui/src/style.rs | 2 +- egui/src/widgets/mod.rs | 2 +- egui/src/widgets/text_edit.rs | 2 +- egui_demo_lib/src/apps/demo/misc_demo_window.rs | 2 +- egui_demo_lib/src/apps/demo/password.rs | 4 ++-- egui_demo_lib/src/backend_panel.rs | 2 +- egui_web/src/lib.rs | 6 +++--- epaint/src/shadow.rs | 4 ++-- epaint/src/tessellator.rs | 4 ++-- epi/README.md | 2 +- sh/start_server.sh | 4 ++-- 21 files changed, 35 insertions(+), 35 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index c34f9d177..e3cec67bd 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -14,9 +14,9 @@ Please make sure there is not already a similar bug report! **To Reproduce** Steps to reproduce the behavior: -1. -2. -3. +1. +2. +3. 4. **Expected behavior** diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md index b4b1b6998..6ceed8c1e 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.md +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -10,7 +10,7 @@ assignees: '' Please make sure there is not already a similar issue! **Is your feature request related to a problem? Please describe.** - + **Describe the solution you'd like** diff --git a/CHANGELOG.md b/CHANGELOG.md index 357ee6003..3c5987d08 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -301,7 +301,7 @@ NOTE: [`epaint`](epaint/CHANGELOG.md), [`eframe`](eframe/CHANGELOG.md), [`egui_w ### Added ⭐ * Turn off `Window` title bars with `window.title_bar(false)`. -* `ImageButton` - `ui.add(ImageButton::new(...))`. +* `ImageButton` - `ui.add(ImageButton::new(…))`. * `ui.vertical_centered` and `ui.vertical_centered_justified`. * `ui.allocate_painter` helper. * Mouse-over explanation to duplicate ID warning. @@ -343,11 +343,11 @@ NOTE: [`epaint`](epaint/CHANGELOG.md), [`eframe`](eframe/CHANGELOG.md), [`egui_w ### Added ⭐ * Emoji support: 1216 different emojis that work in any text. * The Demo app comes with a Font Book to explore the available glyphs. -* `ui.horizontal_wrapped(|ui| ...)`: Add widgets on a row but wrap at `max_size`. +* `ui.horizontal_wrapped(|ui| …)`: Add widgets on a row but wrap at `max_size`. * `ui.horizontal_wrapped_for_text`: Like `ui.horizontal_wrapped`, but with spacing made for embedding text. * `ui.horizontal_for_text`: Like `ui.horizontal`, but with spacing made for embedding text. * `egui::Layout` now supports justified layouts where contents is _also_ centered, right-aligned, etc. -* `ui.allocate_ui(size, |ui| ...)`: Easily create a child-`Ui` of a given size. +* `ui.allocate_ui(size, |ui| …)`: Easily create a child-`Ui` of a given size. * `SelectableLabel` (`ui.selectable_label` and `ui.selectable_value`): A text-button that can be selected. * `ui.small_button`: A smaller button that looks good embedded in text. * `ui.drag_angle_tau`: For those who want to specify angles as fractions of τ (a full turn). @@ -399,7 +399,7 @@ NOTE: [`epaint`](epaint/CHANGELOG.md), [`eframe`](eframe/CHANGELOG.md), [`egui_w * The demo app now has a slider to scale all of egui. ### Changed 🔧 -* `ui.horizontal(...)` etc returns `Response`. +* `ui.horizontal(…)` etc returns `Response`. * Refactored the interface for `egui::app::App`. * Windows are now constrained to the screen. * `Context::begin_frame()` no longer returns a `Ui`. Instead put your widgets into a `SidePanel`, `TopPanel`, `CentralPanel`, `Window` or `Area`. diff --git a/README.md b/README.md index b8074fbdf..cb3a5c876 100644 --- a/README.md +++ b/README.md @@ -158,7 +158,7 @@ egui is build to be easy to integrate into any existing game engine or platform egui itself doesn't know or care on what OS it is running or how to render things to the screen - that is the job of the egui integration. The integration needs to do two things: -* **IO**: Supply egui with input (mouse position, keyboard presses, ...) and handle egui output (cursor changes, copy-paste integration, ...). +* **IO**: Supply egui with input (mouse position, keyboard presses, …) and handle egui output (cursor changes, copy-paste integration, …). * **Painting**: Render the textured triangles that egui outputs. ### Official diff --git a/egui-winit/src/lib.rs b/egui-winit/src/lib.rs index 0e4c9c9a4..3a345faf1 100644 --- a/egui-winit/src/lib.rs +++ b/egui-winit/src/lib.rs @@ -539,7 +539,7 @@ fn open_url(_url: &str) { } } -/// Glium sends special keys (backspace, delete, F1, ...) as characters. +/// Winit sends special keys (backspace, delete, F1, …) as characters. /// Ignore those. /// We also ignore '\r', '\n', '\t'. /// Newlines are handled by the `Key::Enter` event. diff --git a/egui/src/any/mod.rs b/egui/src/any/mod.rs index 499078142..15ea95f74 100644 --- a/egui/src/any/mod.rs +++ b/egui/src/any/mod.rs @@ -37,7 +37,7 @@ //! //! Second, count and reset all instances of a type in [`serializable::IdAnyMap`] could return an incorrect value for the same reason. //! -//! Deserialization errors of loaded elements of these storages can be determined only when you call `get_...` functions, they not logged and not provided to a user, on this errors value is just replaced with `or_insert()`/default value. +//! Deserialization errors of loaded elements of these storages can be determined only when you call `get_…` functions, they not logged and not provided to a user, on this errors value is just replaced with `or_insert()`/default value. //! //! # When not to use this //! diff --git a/egui/src/containers/window.rs b/egui/src/containers/window.rs index 7468eae07..5ab9987ed 100644 --- a/egui/src/containers/window.rs +++ b/egui/src/containers/window.rs @@ -79,14 +79,14 @@ impl<'open> Window<'open> { self } - /// Usage: `Window::new(...).mutate(|w| w.resize = w.resize.auto_expand_width(true))` + /// Usage: `Window::new(…).mutate(|w| w.resize = w.resize.auto_expand_width(true))` /// Not sure this is a good interface for this. pub fn mutate(mut self, mutate: impl Fn(&mut Self)) -> Self { mutate(&mut self); self } - /// Usage: `Window::new(...).resize(|r| r.auto_expand_width(true))` + /// Usage: `Window::new(…).resize(|r| r.auto_expand_width(true))` /// Not sure this is a good interface for this. pub fn resize(mut self, mutate: impl Fn(Resize) -> Resize) -> Self { self.resize = mutate(self.resize); diff --git a/egui/src/data/input.rs b/egui/src/data/input.rs index 89f42bf09..a5edd65fa 100644 --- a/egui/src/data/input.rs +++ b/egui/src/data/input.rs @@ -389,7 +389,7 @@ impl RawInput { #[cfg_attr(feature = "serde", derive(serde::Deserialize, serde::Serialize))] pub struct TouchDeviceId(pub u64); -/// Unique identification of a touch occurrence (finger or pen or ...). +/// Unique identification of a touch occurrence (finger or pen or …). /// A Touch ID is valid until the finger is lifted. /// A new ID is used for the next touch. #[derive(Clone, Copy, Debug, Eq, PartialEq, PartialOrd, Ord)] @@ -403,7 +403,7 @@ pub enum TouchPhase { /// User just placed a touch point on the touch surface Start, /// User moves a touch point along the surface. This event is also sent when - /// any attributes (position, force, ...) of the touch point change. + /// any attributes (position, force, …) of the touch point change. Move, /// User lifted the finger or pen from the surface, or slid off the edge of /// the surface diff --git a/egui/src/menu.rs b/egui/src/menu.rs index 8a96618a2..0ecd0f998 100644 --- a/egui/src/menu.rs +++ b/egui/src/menu.rs @@ -8,7 +8,7 @@ //! menu::bar(ui, |ui| { //! menu::menu(ui, "File", |ui| { //! if ui.button("Open").clicked() { -//! // ... +//! // … //! } //! }); //! }); diff --git a/egui/src/sense.rs b/egui/src/sense.rs index 96f884e15..29fc470b9 100644 --- a/egui/src/sense.rs +++ b/egui/src/sense.rs @@ -2,10 +2,10 @@ #[derive(Clone, Copy, Debug, Eq, PartialEq)] // #[cfg_attr(feature = "serde", derive(serde::Serialize))] pub struct Sense { - /// buttons, sliders, windows ... + /// buttons, sliders, windows, … pub click: bool, - /// sliders, windows, scroll bars, scroll areas ... + /// sliders, windows, scroll bars, scroll areas, … pub drag: bool, /// this widgets want focus. diff --git a/egui/src/style.rs b/egui/src/style.rs index c74c5f033..3eee89caf 100644 --- a/egui/src/style.rs +++ b/egui/src/style.rs @@ -326,7 +326,7 @@ pub struct WidgetVisuals { /// Button frames etc. pub corner_radius: f32, - /// Stroke and text color of the interactive part of a component (button text, slider grab, check-mark, ...). + /// Stroke and text color of the interactive part of a component (button text, slider grab, check-mark, …). pub fg_stroke: Stroke, /// Make the frame this much larger. diff --git a/egui/src/widgets/mod.rs b/egui/src/widgets/mod.rs index 22f657162..98a650268 100644 --- a/egui/src/widgets/mod.rs +++ b/egui/src/widgets/mod.rs @@ -2,7 +2,7 @@ //! //! Example widget uses: //! * `ui.add(Label::new("Text").text_color(color::red));` -//! * `if ui.add(Button::new("Click me")).clicked() { ... }` +//! * `if ui.add(Button::new("Click me")).clicked() { … }` use crate::*; diff --git a/egui/src/widgets/text_edit.rs b/egui/src/widgets/text_edit.rs index 6f5cc6296..2c552e929 100644 --- a/egui/src/widgets/text_edit.rs +++ b/egui/src/widgets/text_edit.rs @@ -391,7 +391,7 @@ impl<'t> TextEdit<'t> { } /// Set to 0.0 to keep as small as possible. - /// Set to [`f32::INFINITY`] to take up all available space. + /// Set to [`f32::INFINITY`] to take up all available space (i.e. disable automatic word wrap). pub fn desired_width(mut self, desired_width: f32) -> Self { self.desired_width = Some(desired_width); self diff --git a/egui_demo_lib/src/apps/demo/misc_demo_window.rs b/egui_demo_lib/src/apps/demo/misc_demo_window.rs index b55a6e445..ea785520c 100644 --- a/egui_demo_lib/src/apps/demo/misc_demo_window.rs +++ b/egui_demo_lib/src/apps/demo/misc_demo_window.rs @@ -163,7 +163,7 @@ impl Widgets { ui.heading("The name of the tooltip"); ui.horizontal(|ui| { ui.label("This tooltip was created with"); - ui.monospace(".on_hover_ui(...)"); + ui.monospace(".on_hover_ui(…)"); }); let _ = ui.button("A button you can never press"); }; diff --git a/egui_demo_lib/src/apps/demo/password.rs b/egui_demo_lib/src/apps/demo/password.rs index 8ed568c64..4b040d5a7 100644 --- a/egui_demo_lib/src/apps/demo/password.rs +++ b/egui_demo_lib/src/apps/demo/password.rs @@ -54,11 +54,11 @@ pub fn password_ui(ui: &mut egui::Ui, text: &mut String) -> egui::Response { ui.memory().id_data_temp.insert(id, plaintext); // All done! Return the interaction response so the user can check what happened - // (hovered, clicked, ...) and maybe show a tooltip: + // (hovered, clicked, …) and maybe show a tooltip: result.response } -// A wrapper that allows the more idiomatic usage pattern: `ui.add(...)` +// A wrapper that allows the more idiomatic usage pattern: `ui.add(…)` /// Password entry field with ability to toggle character hiding. /// /// ## Example: diff --git a/egui_demo_lib/src/backend_panel.rs b/egui_demo_lib/src/backend_panel.rs index 16666384d..9fb175e4b 100644 --- a/egui_demo_lib/src/backend_panel.rs +++ b/egui_demo_lib/src/backend_panel.rs @@ -155,7 +155,7 @@ impl BackendPanel { ui.label( "Everything you see is rendered as textured triangles. There is no DOM. There are no HTML elements. \ This is not JavaScript. This is Rust, running at 60 FPS. This is the web page, reinvented with game tech."); - ui.label("This is also work in progress, and not ready for production... yet :)"); + ui.label("This is also work in progress, and not ready for production… yet :)"); ui.horizontal_wrapped(|ui| { ui.label("Project home page:"); ui.hyperlink("https://github.com/emilk/egui"); diff --git a/egui_web/src/lib.rs b/egui_web/src/lib.rs index 14b7af651..42afaf245 100644 --- a/egui_web/src/lib.rs +++ b/egui_web/src/lib.rs @@ -37,17 +37,17 @@ static AGENT_ID: &str = "egui_text_agent"; // ---------------------------------------------------------------------------- // Helpers to hide some of the verbosity of web_sys -/// Log some text to the developer console (`console.log(...)` in JS) +/// Log some text to the developer console (`console.log(…)` in JS) pub fn console_log(s: impl Into) { web_sys::console::log_1(&s.into()); } -/// Log a warning to the developer console (`console.warn(...)` in JS) +/// Log a warning to the developer console (`console.warn(…)` in JS) pub fn console_warn(s: impl Into) { web_sys::console::warn_1(&s.into()); } -/// Log an error to the developer console (`console.error(...)` in JS) +/// Log an error to the developer console (`console.error(…)` in JS) pub fn console_error(s: impl Into) { web_sys::console::error_1(&s.into()); } diff --git a/epaint/src/shadow.rs b/epaint/src/shadow.rs index 89a132fac..65cbb2577 100644 --- a/epaint/src/shadow.rs +++ b/epaint/src/shadow.rs @@ -14,7 +14,7 @@ pub struct Shadow { } impl Shadow { - /// Tooltips, menus, ... + /// Tooltips, menus, … pub fn small_dark() -> Self { Self { extrusion: 16.0, @@ -22,7 +22,7 @@ impl Shadow { } } - /// Tooltips, menus, ... + /// Tooltips, menus, … pub fn small_light() -> Self { Self { extrusion: 16.0, diff --git a/epaint/src/tessellator.rs b/epaint/src/tessellator.rs index 368971b75..236640f05 100644 --- a/epaint/src/tessellator.rs +++ b/epaint/src/tessellator.rs @@ -81,7 +81,7 @@ impl Path { for i in 1..n - 1 { let mut n1 = (points[i + 1] - points[i]).normalized().rot90(); - // Handle duplicated points (but not triplicated...): + // Handle duplicated points (but not triplicated…): if n0 == Vec2::ZERO { n0 = n1; } else if n1 == Vec2::ZERO { @@ -124,7 +124,7 @@ impl Path { let next_i = if i + 1 == n { 0 } else { i + 1 }; let mut n1 = (points[next_i] - points[i]).normalized().rot90(); - // Handle duplicated points (but not triplicated...): + // Handle duplicated points (but not triplicated…): if n0 == Vec2::ZERO { n0 = n1; } else if n1 == Vec2::ZERO { diff --git a/epi/README.md b/epi/README.md index 66ca97fdb..bb5cba4a4 100644 --- a/epi/README.md +++ b/epi/README.md @@ -8,6 +8,6 @@ `epi` is a backend-agnostic interface for writing apps using `egui` (a platform agnostic GUI library). -This crate provides a common interface for programming an app using egui, which can then be easily plugged into [`eframe`](https://github.com/emilk/egui/tree/master/eframe) (which in a wrapper over [`egui_web`](https://crates.io/crates/egui_web) and/or [`egui_glium`](https://crates.io/crates/egui_glium)). +This crate provides a common interface for programming an app using egui, which can then be easily plugged into [`eframe`](https://github.com/emilk/egui/tree/master/eframe) (which is a wrapper over [`egui_web`](https://crates.io/crates/egui_web) and/or [`egui_glium`](https://crates.io/crates/egui_glium)). This crate is only for those that want to write an app that can be compiled both natively and for the web. diff --git a/sh/start_server.sh b/sh/start_server.sh index 80d480733..7026c5df2 100755 --- a/sh/start_server.sh +++ b/sh/start_server.sh @@ -6,10 +6,10 @@ cd "$script_path/.." # Starts a local web-server that serves the contents of the `doc/` folder, # i.e. the web-version of `egui_demo_app`. -echo "ensuring basic-http-server is installed..." +echo "ensuring basic-http-server is installed…" cargo install basic-http-server -echo "staritng server..." +echo "starting server…" echo "serving at http://localhost:8888" (cd docs && basic-http-server --addr 127.0.0.1:8888 .)