Skip to content

Commit

Permalink
Update egui to 0.28.1 (#143)
Browse files Browse the repository at this point in the history
* Merge from upstream egui 0.28.1

* Update everything else and fix compilation errors

It seems we are now required to use a version of `wasm-bindgen-futures`
that won't compile with Rust nightly versions older than 2024-02-06, so
I upgraded the Rust toolchain to 2024-05-19, the latest version that
works without encountering an unrelated compilation error in the `time`
crate.

* Fix another release-mode-only compilation error

* Fix `BorrowMutError` in web builds

* Make IME work again in web builds

* Fix compiler warnings

* Add spacing at the bottom of the map editor top bar

This is to make it look consistent with how it was before the egui
update.

* Fix doc comment in crates/eframe/src/lib.rs

* Update `image` from 0.24 to 0.25

This fixes the displaying of the icon in the "About" window.

* Remove eframe text agent after panic in web builds

* Focus the HTML canvas on startup in web builds

The release notes for eframe 0.28.0 say you need to focus the canvas on
startup if you're creating a fullscreen app.

* Fix terminal scroll delta calculation when unit is pages

* Fix compiler warning in steam.rs
  • Loading branch information
white-axe authored Jul 22, 2024
1 parent ea00f57 commit 19baad9
Show file tree
Hide file tree
Showing 68 changed files with 2,603 additions and 1,568 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/build-steam.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
sudo apt install libgtk-3-dev libatk1.0-dev libxcb-render0-dev libxcb-shape0-dev libxcb-xfixes0-dev libspeechd-dev libxkbcommon-dev libssl-dev libasound2-dev clang mold -y
- uses: dtolnay/rust-toolchain@nightly
with:
toolchain: nightly-2024-02-01
toolchain: nightly-2024-05-19
- name: Rust Cache
uses: Swatinem/rust-cache@v2
- name: Build luminol (Release)
Expand All @@ -48,7 +48,7 @@ jobs:
submodules: true
- uses: dtolnay/rust-toolchain@nightly
with:
toolchain: nightly-2024-02-01
toolchain: nightly-2024-05-19
- name: Rust Cache
uses: Swatinem/rust-cache@v2
- name: Build luminol (Release)
Expand All @@ -73,7 +73,7 @@ jobs:
submodules: true
- uses: dtolnay/rust-toolchain@nightly
with:
toolchain: nightly-2024-02-01
toolchain: nightly-2024-05-19
- name: Rust Cache
uses: Swatinem/rust-cache@v2
- name: Build luminol (Release)
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
sudo apt install libgtk-3-dev libatk1.0-dev libxcb-render0-dev libxcb-shape0-dev libxcb-xfixes0-dev libspeechd-dev libxkbcommon-dev libssl-dev libasound2-dev clang mold -y
- uses: dtolnay/rust-toolchain@nightly
with:
toolchain: nightly-2024-02-01
toolchain: nightly-2024-05-19
- name: Rust Cache
uses: Swatinem/rust-cache@v2
- name: Build luminol (Release)
Expand All @@ -46,7 +46,7 @@ jobs:
submodules: true
- uses: dtolnay/rust-toolchain@nightly
with:
toolchain: nightly-2024-02-01
toolchain: nightly-2024-05-19
- name: Rust Cache
uses: Swatinem/rust-cache@v2
- name: Build luminol (Release)
Expand All @@ -70,7 +70,7 @@ jobs:
submodules: true
- uses: dtolnay/rust-toolchain@nightly
with:
toolchain: nightly-2024-02-01
toolchain: nightly-2024-05-19
- name: Rust Cache
uses: Swatinem/rust-cache@v2
- name: Build luminol (Release)
Expand Down Expand Up @@ -98,7 +98,7 @@ jobs:
sudo apt install libgtk-3-dev libatk1.0-dev libxcb-render0-dev libxcb-shape0-dev libxcb-xfixes0-dev libspeechd-dev libxkbcommon-dev libssl-dev libasound2-dev clang mold -y
- uses: dtolnay/rust-toolchain@nightly
with:
toolchain: nightly-2024-02-01
toolchain: nightly-2024-05-19
targets: wasm32-unknown-unknown
components: rust-src
- name: Download and install Trunk binary
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
sudo apt install libgtk-3-dev libatk1.0-dev libxcb-render0-dev libxcb-shape0-dev libxcb-xfixes0-dev libspeechd-dev libxkbcommon-dev libssl-dev libasound2-dev clang mold -y
- uses: dtolnay/rust-toolchain@nightly
with:
toolchain: nightly-2024-02-01
toolchain: nightly-2024-05-19
- name: Rust Cache
uses: Swatinem/rust-cache@v2
- run: cargo check --all-features
Expand All @@ -45,7 +45,7 @@ jobs:
sudo apt install libgtk-3-dev libatk1.0-dev libxcb-render0-dev libxcb-shape0-dev libxcb-xfixes0-dev libspeechd-dev libxkbcommon-dev libssl-dev libasound2-dev clang mold -y
- uses: dtolnay/rust-toolchain@nightly
with:
toolchain: nightly-2024-02-01
toolchain: nightly-2024-05-19
targets: wasm32-unknown-unknown
components: rust-src
- name: Rust Cache
Expand All @@ -65,7 +65,7 @@ jobs:
# sudo apt install libgtk-3-dev libatk1.0-dev libxcb-render0-dev libxcb-shape0-dev libxcb-xfixes0-dev libspeechd-dev libxkbcommon-dev libssl-dev libasound2-dev clang mold -y
# - uses: dtolnay/rust-toolchain@nightly
# with:
# toolchain: nightly-2024-02-01
# toolchain: nightly-2024-05-19
# - name: Rust Cache
# uses: Swatinem/rust-cache@v2
# - run: cargo test --workspace
Expand All @@ -83,7 +83,7 @@ jobs:
sudo apt install libgtk-3-dev libatk1.0-dev libxcb-render0-dev libxcb-shape0-dev libxcb-xfixes0-dev libspeechd-dev libxkbcommon-dev libssl-dev libasound2-dev clang mold -y
- uses: dtolnay/rust-toolchain@nightly
with:
toolchain: nightly-2024-02-01
toolchain: nightly-2024-05-19
components: rustfmt
- name: Rust Cache
uses: Swatinem/rust-cache@v2
Expand All @@ -102,7 +102,7 @@ jobs:
sudo apt install libgtk-3-dev libatk1.0-dev libxcb-render0-dev libxcb-shape0-dev libxcb-xfixes0-dev libspeechd-dev libxkbcommon-dev libssl-dev libasound2-dev clang mold -y
- uses: dtolnay/rust-toolchain@nightly
with:
toolchain: nightly-2024-02-01
toolchain: nightly-2024-05-19
components: clippy
- name: Rust Cache
uses: Swatinem/rust-cache@v2
Expand Down
Loading

0 comments on commit 19baad9

Please sign in to comment.