From a7b6334784717b4e59de4a48380868120be88051 Mon Sep 17 00:00:00 2001 From: Emil Ernerfeldt Date: Wed, 13 Apr 2022 22:05:19 +0200 Subject: [PATCH] Misc doc improvements --- .github/workflows/rust.yml | 2 +- README.md | 2 +- docs/index.html | 2 +- eframe/README.md | 4 +++- egui/src/containers/collapsing_header.rs | 1 - egui/src/containers/frame.rs | 12 +++++++++++- egui/src/containers/scroll_area.rs | 2 ++ egui/src/lib.rs | 3 +++ egui/src/ui.rs | 2 +- egui/src/widgets/text_edit/builder.rs | 3 +++ egui_demo_app/Cargo.toml | 4 ++++ egui_glow/README.md | 8 ++++++-- epaint/src/image.rs | 10 +++++++--- epaint/src/text/fonts.rs | 9 +++++---- 14 files changed, 48 insertions(+), 16 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 114ce4fe..3d9c046c 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -160,7 +160,7 @@ jobs: toolchain: 1.60.0 override: true - run: sudo apt-get update && sudo apt-get install libspeechd-dev - - run: cargo doc -p emath -p epaint -p egui -p eframe -p epi -p egui_web -p egui-winit -p egui_extras -p egui_glium -p egui_glow --lib --no-deps --all-features + - run: cargo doc -p eframe -p egui -p egui_extras -p egui_glium -p egui_glow -p egui_web -p egui-winit -p emath -p epaint -p epi --lib --no-deps --all-features doc_web: name: cargo doc web diff --git a/README.md b/README.md index f83aea47..d3899510 100644 --- a/README.md +++ b/README.md @@ -165,7 +165,7 @@ If you're making an app, your best bet is using [`eframe`](https://github.com/em These are the official egui integrations: * [`egui_glium`](https://github.com/emilk/egui/tree/master/egui_glium) for compiling native apps with [Glium](https://github.com/glium/glium). -* [`egui_glow`](https://github.com/emilk/egui/tree/master/egui_glow) for compiling native apps with [glow](https://github.com/grovesNL/glow). +* [`egui_glow`](https://github.com/emilk/egui/tree/master/egui_glow) for rendering egui with [glow](https://github.com/grovesNL/glow) on native and web, and for making native apps. * [`egui_web`](https://github.com/emilk/egui/tree/master/egui_web) for making a web app. Compiles to WASM, renders with WebGL. [Click to run the egui demo](https://www.egui.rs/#demo). Uses `egui_glow`. * [`egui-winit`](https://github.com/emilk/egui/tree/master/egui-winit) for integrating with [winit](https://github.com/rust-windowing/winit). `egui-winit` is used by `egui_glium` and `egui_glow`. diff --git a/docs/index.html b/docs/index.html index bf9dfb5f..648ba74c 100644 --- a/docs/index.html +++ b/docs/index.html @@ -6,7 +6,7 @@ - egui – An experimental immediate mode GUI written in Rust + egui – An immediate mode GUI written in Rust