Skip to content

Commit

Permalink
Merge branch 'emilk:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
fornwall authored Nov 10, 2023
2 parents 3cab633 + 9ee6669 commit 1ab700c
Show file tree
Hide file tree
Showing 23 changed files with 795 additions and 206 deletions.
2 changes: 1 addition & 1 deletion .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Please read the "Making a PR" section of [`CONTRIBUTING.md`](https://github.com/
* Open the PR as a draft until you have self-reviewed it and run `./scripts/check.sh`.
* When you have addressed a PR comment, mark it as resolved.
Please be patient! I will review you PR, but my time is limited!
Please be patient! I will review your PR, but my time is limited!
-->

Closes <https://github.com/emilk/egui/issues/THE_RELEVANT_ISSUE>.
2 changes: 1 addition & 1 deletion .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ jobs:
toolchain: 1.70.0
targets: wasm32-unknown-unknown

- run: sudo apt-get update && sudo apt-get install libgtk-3-dev
- run: sudo apt-get update && sudo apt-get install libgtk-3-dev libatk1.0-dev

- name: Set up cargo cache
uses: Swatinem/rust-cache@v2
Expand Down
104 changes: 77 additions & 27 deletions Cargo.lock

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

2 changes: 1 addition & 1 deletion crates/egui-winit/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ winit = { version = "0.29", default-features = false, features = ["rwh_05"] }
#! ### Optional dependencies

# feature accesskit
accesskit_winit = { version = "0.14.0", optional = true }
accesskit_winit = { version = "0.15.0", optional = true }

## Enable this when generating docs.
document-features = { version = "0.2", optional = true }
Expand Down
2 changes: 1 addition & 1 deletion crates/egui/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ ahash = { version = "0.8.1", default-features = false, features = [
nohash-hasher = "0.2"

#! ### Optional dependencies
accesskit = { version = "0.11", optional = true }
accesskit = { version = "0.12", optional = true }

backtrace = { version = "0.3", optional = true }

Expand Down
2 changes: 1 addition & 1 deletion crates/egui/src/animation_manager.rs
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ struct ValueAnim {
}

impl AnimationManager {
/// See `Context::animate_bool` for documentation
/// See [`crate::Context::animate_bool`] for documentation
pub fn animate_bool(
&mut self,
input: &InputState,
Expand Down
Loading

0 comments on commit 1ab700c

Please sign in to comment.