diff --git a/README.md b/README.md index 07feea9b..e2c2fd6b 100644 --- a/README.md +++ b/README.md @@ -32,11 +32,11 @@ Sections: ## Quick start -If you just want to write a GUI application in Rust (for the web or for native), go to and follow the instructions there! +If you just want to write a GUI application in Rust (for the web or for native), go to and follow the instructions there! The official docs are at . For inspiration, check out the [the egui web demo](https://emilk.github.io/egui/index.html) and follow the links in it to its source code. There is also an excellent tutorial video at . If you want to integrate egui into an existing engine, go to the [Integrations](#integrations) section. -If you have questions, use [GitHub Discussions](https://github.com/emilk/egui/discussions). There is also [an egui discord server](https://discord.gg/JFcEma9bJq). If you want to contribute to egui, please read the [Contributing Guidelines](https://github.com/emilk/egui/blob/master/CONTRIBUTING.md) +If you have questions, use [GitHub Discussions](https://github.com/emilk/egui/discussions). There is also [an egui discord server](https://discord.gg/JFcEma9bJq). If you want to contribute to egui, please read the [Contributing Guidelines](https://github.com/emilk/egui/blob/master/CONTRIBUTING.md). ## Demo diff --git a/docs/README.md b/docs/README.md new file mode 100644 index 00000000..077fb745 --- /dev/null +++ b/docs/README.md @@ -0,0 +1,3 @@ +This folder contains the files required for the egui web demo hosted at . + +The reason the folder is called "docs" is because that is the name that GitHub requires in order to host a web page from the `master` branch of a repository. diff --git a/egui/src/ui.rs b/egui/src/ui.rs index bdccf422..cbaba6f6 100644 --- a/egui/src/ui.rs +++ b/egui/src/ui.rs @@ -119,6 +119,8 @@ impl Ui { } /// Style options for this `Ui` and its children. + /// + /// Note that this may be a different [`Style`] than that of [`Context::style`]. #[inline] pub fn style(&self) -> &std::sync::Arc