Skip to content

Commit

Permalink
Merge branch 'master' into multiples_viewports
Browse files Browse the repository at this point in the history
  • Loading branch information
emilk committed Nov 1, 2023
2 parents cc31695 + f218825 commit 06af749
Show file tree
Hide file tree
Showing 22 changed files with 205 additions and 130 deletions.
38 changes: 38 additions & 0 deletions .github/workflows/spelling_and_links.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
name: Check spelling and links
on: [pull_request]

jobs:
typos:
# https://github.com/crate-ci/typos
# Add exceptions to _typos.toml
# install and run locally: cargo install typos-cli && typos
name: typos
runs-on: ubuntu-latest
steps:
- name: Checkout Actions Repository
uses: actions/checkout@v4

- name: Check spelling of entire workspace
uses: crate-ci/typos@master
# Disabled: too many names of crates and user-names etc
# spellcheck:
# name: Spellcheck
# runs-on: ubuntu-latest
# steps:
# - uses: actions/checkout@v4
# - uses: streetsidesoftware/cspell-action@v2
# with:
# files: "**/*.md"
linkinator:
name: linkinator
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: jprochazk/linkinator-action@main
with:
linksToSkip: "https://crates.io/crates/.*, http://localhost:.*" # Avoid crates.io rate-limiting
retry: true
retryErrors: true
retryErrorsCount: 5
retryErrorsJitter: 2000

17 changes: 0 additions & 17 deletions .github/workflows/typos.yml

This file was deleted.

4 changes: 2 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,7 @@ egui_extras::install_image_loaders(egui_ctx);

### Contributors 🙏
* [4JX](https://github.com/4JX)
* [AlexxxRu](https://github.com/AlexxxRu)
* [a-liashenko](https://github.com/a-liashenko)
* [ascclemens](https://github.com/ascclemens)
* [awaken1ng](https://github.com/awaken1ng)
* [bigfarts](https://github.com/bigfarts)
Expand Down Expand Up @@ -425,7 +425,7 @@ egui_extras::install_image_loaders(egui_ctx);
* [4JX](https://github.com/4JX)
* [55nknown](https://github.com/55nknown)
* [AlanRace](https://github.com/AlanRace)
* [AlexxxRu](https://github.com/AlexxxRu)
* [a-liashenko](https://github.com/a-liashenko)
* [awaken1ng](https://github.com/awaken1ng)
* [BctfN0HUK7Yg](https://github.com/BctfN0HUK7Yg)
* [Bromeon](https://github.com/Bromeon)
Expand Down
104 changes: 66 additions & 38 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,7 @@ Yes! You can customize the colors, spacing, fonts and sizes of everything using

This is not yet as powerful as say CSS, [but this is going to improve soon](https://github.com/emilk/egui/issues/3284).

Here is an example (from https://github.com/AlexxxRu/TinyPomodoro):
Here is an example (from https://github.com/a-liashenko/TinyPomodoro):

<img src="media/pompodoro-skin.png" width="50%">

Expand Down Expand Up @@ -332,7 +332,7 @@ If you want to embed 3D into an egui view there are two options.

#### `Shape::Callback`
Example:
* <https://github.com/emilk/egui/blob/master/examples/custom_3d_glow.rs>
* <https://github.com/emilk/egui/blob/master/examples/custom_3d_glow/src/main.rs>

`Shape::Callback` will call your code when egui gets painted, to show anything using whatever the background rendering context is. When using [`eframe`](https://github.com/emilk/egui/tree/master/crates/eframe) this will be [`glow`](https://github.com/grovesNL/glow). Other integrations will give you other rendering contexts, if they support `Shape::Callback` at all.

Expand Down
Loading

0 comments on commit 06af749

Please sign in to comment.