Update to egui 0.24

rerun-io · Nov 23, 2023 · dbbb94f · dbbb94f
1 parent 7a3991d
commit dbbb94f
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 10 deletions.
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -16,7 +16,7 @@ jobs:
       - uses: actions-rs/toolchain@v1
         with:
           profile: default
-          toolchain: 1.70.0
+          toolchain: 1.72.0
           override: true
 
       - name: Install packages (Linux)
@@ -100,7 +100,7 @@ jobs:
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: 1.70.0
+          toolchain: 1.72.0
           target: wasm32-unknown-unknown
           override: true
 
@@ -128,6 +128,6 @@ jobs:
     - uses: actions/checkout@v3
     - uses: EmbarkStudios/cargo-deny-action@v1
       with:
-        rust-version: "1.70.0"
+        rust-version: "1.72.0"
         log-level: warn
         command: check
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 
 ## [Unreleased](https://github.com/rerun-io/egui_tiles/compare/latest...HEAD)
+* Fix Id clash when using multiple Trees (#32)
+* Scrollable tab bar (#9)
+* `Behavior::on_tab_button` can now add context menus, on hover ui etc. (#23)
+* `serde` is now and optional dependency (#13)
+* Update to egui 0.24
+* Update MSRV to Rust 1.72
 
 
 ## [0.3.1]](https://github.com/rerun-io/egui_tiles/compare/0.3.0...0.3.1) - 2023-09-29

diff --git a/Cargo.toml b/Cargo.toml
@@ -13,7 +13,7 @@ license = "MIT OR Apache-2.0"
 name = "egui_tiles"
 readme = "README.md"
 repository = "https://github.com/rerun-io/egui_tiles"
-rust-version = "1.70"
+rust-version = "1.72"
 version = "0.3.1"
 
 [package.metadata.docs.rs]
@@ -25,15 +25,15 @@ ahash = { version = "0.8.1", default-features = false, features = [
   "no-rng", # we don't need DOS-protection for what we use ahash for
   "std",
 ] }
-egui = { version = "0.23", default-features = false }
+egui = { version = "0.24", default-features = false }
 itertools = "0.11"
 log = { version = "0.4", features = ["std"] }
 serde = { version = "1", features = ["derive"], optional = true }
 
 
 # For the example:
 [dev-dependencies]
-eframe = { version = "0.23", default-features = false, features = [
+eframe = { version = "0.24", default-features = false, features = [
   "default_fonts",
   "glow",
   "persistence",

diff --git a/clippy.toml b/clippy.toml
@@ -1,4 +1,4 @@
-msrv = "1.70"
+msrv = "1.72"
 
 allow-unwrap-in-tests = true
 

diff --git a/examples/advanced.rs b/examples/advanced.rs
@@ -5,7 +5,7 @@ use eframe::egui;
 fn main() -> Result<(), eframe::Error> {
     env_logger::init(); // Log to stderr (if you run with `RUST_LOG=debug`).
     let options = eframe::NativeOptions {
-        initial_window_size: Some(egui::vec2(800.0, 600.0)),
+        viewport: egui::ViewportBuilder::default().with_inner_size([800.0, 600.0]),
         ..Default::default()
     };
     eframe::run_native(

diff --git a/examples/simple.rs b/examples/simple.rs
@@ -39,7 +39,7 @@ fn main() -> Result<(), eframe::Error> {
     env_logger::init(); // Log to stderr (if you run with `RUST_LOG=debug`).
 
     let options = eframe::NativeOptions {
-        initial_window_size: Some(egui::vec2(320.0, 240.0)),
+        viewport: egui::ViewportBuilder::default().with_inner_size([320.0, 240.0]),
         ..Default::default()
     };
 

diff --git a/rust-toolchain b/rust-toolchain
@@ -5,6 +5,6 @@
 # to the user in the error, instead of "error: invalid channel name '[toolchain]'".
 
 [toolchain]
-channel = "1.70.0"
+channel = "1.72.0"
 components = ["rustfmt", "clippy"]
 targets = ["wasm32-unknown-unknown"]