Merge branch 'main' into lucas/experiments/measure-widget-size

# Conflicts: # crates/egui/src/atomics/atom.rs # crates/egui/src/atomics/atom_kind.rs # crates/egui/src/atomics/atom_layout.rs # crates/egui/src/containers/sides.rs # crates/egui/src/placer.rs # crates/egui/src/widgets/label.rs # crates/egui/src/widgets/selected_label.rs # crates/egui_demo_lib/src/demo/dancing_strings.rs # crates/egui_extras/src/layout.rs # crates/epaint/src/text/text_layout_types.rs
2026-08-30 13:20:05 -04:00 · 2025-07-14 15:35:38 +02:00
parent 3c39dee7f0 fdcaff8465
commit 9f2093bbd5
336 changed files with 3896 additions and 1837 deletions
--- a/examples/confirm_exit/Cargo.toml
+++ b/examples/confirm_exit/Cargo.toml
@@ -3,8 +3,8 @@ name = "confirm_exit"
 version = "0.1.0"
 authors = ["Emil Ernerfeldt <emil.ernerfeldt@gmail.com>"]
 license = "MIT OR Apache-2.0"
-edition = "2021"
-rust-version = "1.84"
+edition = "2024"
+rust-version = "1.85"
 publish = false

 [lints]
--- a/examples/confirm_exit/screenshot.png
+++ b/examples/confirm_exit/screenshot.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3122591a76a063f1db0b88b54ecc4afe012ee27a1404c0948d0b9d639aeeece6
-size 3124
+oid sha256:0175461bbd86fffaad3538ea8dcec5001c7511aa201aa37b7736e7d2010b1522
+size 3483
--- a/examples/custom_3d_glow/Cargo.toml
+++ b/examples/custom_3d_glow/Cargo.toml
@@ -3,8 +3,8 @@ name = "custom_3d_glow"
 version = "0.1.0"
 authors = ["Emil Ernerfeldt <emil.ernerfeldt@gmail.com>"]
 license = "MIT OR Apache-2.0"
-edition = "2021"
-rust-version = "1.84"
+edition = "2024"
+rust-version = "1.85"
 publish = false

 [lints]
--- a/examples/custom_3d_glow/screenshot.png
+++ b/examples/custom_3d_glow/screenshot.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4dd5ffcf5a530f6fbe959fd74e2f5b4aeaee335baf79ad1cde8e42c34d84156c
-size 24590
+oid sha256:b5f36e1df27007b19cf56771145a667b4410dc9f4697afe629a2b42518640d62
+size 26531
--- a/examples/custom_font/Cargo.toml
+++ b/examples/custom_font/Cargo.toml
@@ -3,8 +3,8 @@ name = "custom_font"
 version = "0.1.0"
 authors = ["Emil Ernerfeldt <emil.ernerfeldt@gmail.com>"]
 license = "MIT OR Apache-2.0"
-edition = "2021"
-rust-version = "1.84"
+edition = "2024"
+rust-version = "1.85"
 publish = false

 [lints]
--- a/examples/custom_font/screenshot.png
+++ b/examples/custom_font/screenshot.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d0ab12a55c0d87f044ef7675f5b94b39977f2c5d3a2ea74eb843dfc85d5b9f31
-size 5645
+oid sha256:a5bdb725a17bb6f8871ee95ae8cf46e55055083b0be14716cccd17615c863c81
+size 6179
--- a/examples/custom_font_style/Cargo.toml
+++ b/examples/custom_font_style/Cargo.toml
@@ -3,8 +3,8 @@ name = "custom_font_style"
 version = "0.1.0"
 authors = ["tami5 <kkharji@proton.me>"]
 license = "MIT OR Apache-2.0"
-edition = "2021"
-rust-version = "1.84"
+edition = "2024"
+rust-version = "1.85"
 publish = false

 [lints]
--- a/examples/custom_font_style/screenshot.png
+++ b/examples/custom_font_style/screenshot.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5d443ef30cf12d2c4367135fd663270ed46f4864af2f3aae424610be86c73197
-size 66193
+oid sha256:044417e2259f58b8b71c44c49a60fe928e7faac1616d76eba7e156764c1bc2b2
+size 88583
--- a/examples/custom_keypad/Cargo.toml
+++ b/examples/custom_keypad/Cargo.toml
@@ -3,8 +3,8 @@ name = "custom_keypad"
 version = "0.1.0"
 authors = ["Varphone Wong <varphone@qq.com>"]
 license = "MIT OR Apache-2.0"
-edition = "2021"
-rust-version = "1.84"
+edition = "2024"
+rust-version = "1.85"
 publish = false

 [lints]
--- a/examples/custom_keypad/src/keypad.rs
+++ b/examples/custom_keypad/src/keypad.rs
@@ -1,4 +1,4 @@
-use eframe::egui::{self, pos2, vec2, Button, Ui, Vec2};
+use eframe::egui::{self, Button, Ui, Vec2, pos2, vec2};

 #[derive(Clone, Copy, Debug, Default, PartialEq)]
 enum Transition {
--- a/examples/custom_style/Cargo.toml
+++ b/examples/custom_style/Cargo.toml
@@ -2,8 +2,8 @@
 name = "custom_style"
 version = "0.1.0"
 license = "MIT OR Apache-2.0"
-edition = "2021"
-rust-version = "1.84"
+edition = "2024"
+rust-version = "1.85"
 publish = false

 [lints]
--- a/examples/custom_style/src/main.rs
+++ b/examples/custom_style/src/main.rs
@@ -2,7 +2,7 @@
 #![allow(rustdoc::missing_crate_level_docs)] // it's an example

 use eframe::egui::{
-    self, global_theme_preference_buttons, style::Selection, Color32, Stroke, Style, Theme,
+    self, Color32, Stroke, Style, Theme, global_theme_preference_buttons, style::Selection,
 };
 use egui_demo_lib::{View as _, WidgetGallery};

--- a/examples/custom_window_frame/Cargo.toml
+++ b/examples/custom_window_frame/Cargo.toml
@@ -3,8 +3,8 @@ name = "custom_window_frame"
 version = "0.1.0"
 authors = ["Emil Ernerfeldt <emil.ernerfeldt@gmail.com>"]
 license = "MIT OR Apache-2.0"
-edition = "2021"
-rust-version = "1.84"
+edition = "2024"
+rust-version = "1.85"
 publish = false

 [lints]
--- a/examples/custom_window_frame/screenshot.png
+++ b/examples/custom_window_frame/screenshot.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bfdf77d119ae7926f52ac781455c4b1574eea53276069614738ba8b13b9921ea
-size 6024
+oid sha256:1eba63346816dfbcf90c6b87e8df8b2de989d33359fda91041a813c474f85cc1
+size 17981
--- a/examples/custom_window_frame/src/main.rs
+++ b/examples/custom_window_frame/src/main.rs
@@ -75,7 +75,7 @@ fn custom_window_frame(ctx: &egui::Context, title: &str, add_contents: impl FnOn
 }

 fn title_bar_ui(ui: &mut egui::Ui, title_bar_rect: eframe::epaint::Rect, title: &str) {
-    use egui::{vec2, Align2, FontId, Id, PointerButton, Sense, UiBuilder};
+    use egui::{Align2, FontId, Id, PointerButton, Sense, UiBuilder, vec2};

    let painter = ui.painter();

--- a/examples/external_eventloop/Cargo.toml
+++ b/examples/external_eventloop/Cargo.toml
@@ -3,8 +3,8 @@ name = "external_eventloop"
 version = "0.1.0"
 authors = ["Will Brown <opensource@rebeagle.com>"]
 license = "MIT OR Apache-2.0"
-edition = "2021"
-rust-version = "1.84"
+edition = "2024"
+rust-version = "1.85"
 publish = false

 [lints]
--- a/examples/external_eventloop/screenshot.png
+++ b/examples/external_eventloop/screenshot.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2f2630b0cfe5b044698e9f9533752e23a130e1984dfa0123645bc040d412dba5
+size 8636
--- a/examples/external_eventloop/src/main.rs
+++ b/examples/external_eventloop/src/main.rs
@@ -1,7 +1,7 @@
 #![cfg_attr(not(debug_assertions), windows_subsystem = "windows")] // hide console window on Windows in release
 #![allow(rustdoc::missing_crate_level_docs)] // it's an example

-use eframe::{egui, UserEvent};
+use eframe::{UserEvent, egui};
 use std::{cell::Cell, rc::Rc};
 use winit::event_loop::{ControlFlow, EventLoop};

--- a/examples/external_eventloop_async/Cargo.toml
+++ b/examples/external_eventloop_async/Cargo.toml
@@ -3,8 +3,8 @@ name = "external_eventloop_async"
 version = "0.1.0"
 authors = ["Will Brown <opensource@rebeagle.com>"]
 license = "MIT OR Apache-2.0"
-edition = "2021"
-rust-version = "1.84"
+edition = "2024"
+rust-version = "1.85"
 publish = false

 [lints]
--- a/examples/external_eventloop_async/src/app.rs
+++ b/examples/external_eventloop_async/src/app.rs
@@ -1,4 +1,4 @@
-use eframe::{egui, EframePumpStatus, UserEvent};
+use eframe::{EframePumpStatus, UserEvent, egui};
 use std::{cell::Cell, io, os::fd::AsRawFd as _, rc::Rc, time::Duration};
 use tokio::task::LocalSet;
 use winit::event_loop::{ControlFlow, EventLoop};
--- a/examples/file_dialog/Cargo.toml
+++ b/examples/file_dialog/Cargo.toml
@@ -3,8 +3,8 @@ name = "file_dialog"
 version = "0.1.0"
 authors = ["Emil Ernerfeldt <emil.ernerfeldt@gmail.com>"]
 license = "MIT OR Apache-2.0"
-edition = "2021"
-rust-version = "1.84"
+edition = "2024"
+rust-version = "1.85"
 publish = false

 [lints]
--- a/examples/hello_android/Cargo.toml
+++ b/examples/hello_android/Cargo.toml
@@ -3,8 +3,8 @@ name = "hello_android"
 version = "0.1.0"
 authors = ["Emil Ernerfeldt <emil.ernerfeldt@gmail.com>"]
 license = "MIT OR Apache-2.0"
-edition = "2021"
-rust-version = "1.84"
+edition = "2024"
+rust-version = "1.85"
 publish = false

 # `unsafe_code` is required for `#[no_mangle]`, disable workspace lints to workaround lint error.
--- a/examples/hello_android/src/lib.rs
+++ b/examples/hello_android/src/lib.rs
@@ -1,6 +1,6 @@
 #![doc = include_str!("../README.md")]

-use eframe::{egui, CreationContext};
+use eframe::{CreationContext, egui};

 #[cfg(target_os = "android")]
 #[no_mangle]
--- a/examples/hello_world/Cargo.toml
+++ b/examples/hello_world/Cargo.toml
@@ -3,8 +3,8 @@ name = "hello_world"
 version = "0.1.0"
 authors = ["Emil Ernerfeldt <emil.ernerfeldt@gmail.com>"]
 license = "MIT OR Apache-2.0"
-edition = "2021"
-rust-version = "1.84"
+edition = "2024"
+rust-version = "1.85"
 publish = false

 [lints]
--- a/examples/hello_world_par/Cargo.toml
+++ b/examples/hello_world_par/Cargo.toml
@@ -3,8 +3,8 @@ name = "hello_world_par"
 version = "0.1.0"
 authors = ["Maxim Osipenko <maxim1999max@gmail.com>"]
 license = "MIT OR Apache-2.0"
-edition = "2021"
-rust-version = "1.84"
+edition = "2024"
+rust-version = "1.85"
 publish = false

 [lints]
--- a/examples/hello_world_simple/Cargo.toml
+++ b/examples/hello_world_simple/Cargo.toml
@@ -3,8 +3,8 @@ name = "hello_world_simple"
 version = "0.1.0"
 authors = ["Emil Ernerfeldt <emil.ernerfeldt@gmail.com>"]
 license = "MIT OR Apache-2.0"
-edition = "2021"
-rust-version = "1.84"
+edition = "2024"
+rust-version = "1.85"
 publish = false

 [lints]
--- a/examples/hello_world_simple/screenshot.png
+++ b/examples/hello_world_simple/screenshot.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0bb13d0cb819d30ffbcd12d9327589a1e3ca226943cb381fa17eccfb8f7c06fb
-size 3229
+oid sha256:7be893df63405f3e86d1eb280083914a7ac63bb21fb8dce47e0476fb48ec9bd8
+size 8293
--- a/examples/images/Cargo.toml
+++ b/examples/images/Cargo.toml
@@ -3,8 +3,8 @@ name = "images"
 version = "0.1.0"
 authors = ["Jan Procházka <github.com/jprochazk>"]
 license = "MIT OR Apache-2.0"
-edition = "2021"
-rust-version = "1.84"
+edition = "2024"
+rust-version = "1.85"
 publish = false

 [lints]
--- a/examples/images/screenshot.png
+++ b/examples/images/screenshot.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a836741d52e1972b2047cefaabf59f601637d430d4b41bf6407ebda4f7931dac
-size 273450
+oid sha256:329972caa792f9e3a7caf207f41c35e1e26f0d09067e9282bf6538d560f13f7c
+size 79617
--- a/examples/keyboard_events/Cargo.toml
+++ b/examples/keyboard_events/Cargo.toml
@@ -3,8 +3,8 @@ name = "keyboard_events"
 version = "0.1.0"
 authors = ["Jose Palazon <jose@palako.com>"]
 license = "MIT OR Apache-2.0"
-edition = "2021"
-rust-version = "1.84"
+edition = "2024"
+rust-version = "1.85"
 publish = false

 [lints]
--- a/examples/keyboard_events/screenshot.png
+++ b/examples/keyboard_events/screenshot.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6cf53e0da26c4295bafe9cbb9ea0ad8c50933e29eb67467c3a11783697ec5494
-size 7525
+oid sha256:45fce5a660dbca5a2ecca2fa93fa99b67dce7b03ad583fb5d44d2642d052a80c
+size 8603
--- a/examples/multiple_viewports/Cargo.toml
+++ b/examples/multiple_viewports/Cargo.toml
@@ -3,8 +3,8 @@ name = "multiple_viewports"
 version = "0.1.0"
 authors = ["Emil Ernerfeldt <emil.ernerfeldt@gmail.com>"]
 license = "MIT OR Apache-2.0"
-edition = "2021"
-rust-version = "1.84"
+edition = "2024"
+rust-version = "1.85"
 publish = false

 [lints]
--- a/examples/multiple_viewports/src/main.rs
+++ b/examples/multiple_viewports/src/main.rs
@@ -2,8 +2,8 @@
 #![allow(rustdoc::missing_crate_level_docs)] // it's an example

 use std::sync::{
-    atomic::{AtomicBool, Ordering},
    Arc,
+    atomic::{AtomicBool, Ordering},
 };

 use eframe::egui;
--- a/examples/popups/screenshot.png
+++ b/examples/popups/screenshot.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e082670ac9daaee83e593c5dab0e3fccc6f6a4b824071f4983f7f51da144cad9
+size 17893
--- a/examples/puffin_profiler/Cargo.toml
+++ b/examples/puffin_profiler/Cargo.toml
@@ -3,8 +3,8 @@ name = "puffin_profiler"
 version = "0.1.0"
 authors = ["Emil Ernerfeldt <emil.ernerfeldt@gmail.com>"]
 license = "MIT OR Apache-2.0"
-edition = "2021"
-rust-version = "1.84"
+edition = "2024"
+rust-version = "1.85"
 publish = false

 [package.metadata.cargo-machete]
--- a/examples/puffin_profiler/screenshot.png
+++ b/examples/puffin_profiler/screenshot.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:610b003b4c7715751d2d3753d304e2c5a0af17c9259fa24f21a97b33b9d0c3c7
-size 8549
+oid sha256:0787ac28dc8a0ca979f9be5f20c3fb1e2e1c5733add61d201bfe965590afe062
+size 25999
--- a/examples/puffin_profiler/src/main.rs
+++ b/examples/puffin_profiler/src/main.rs
@@ -2,15 +2,21 @@
 #![allow(rustdoc::missing_crate_level_docs)] // it's an example

 use std::sync::{
-    atomic::{AtomicBool, Ordering},
    Arc,
+    atomic::{AtomicBool, Ordering},
 };

 use eframe::egui;

 fn main() -> eframe::Result {
    let rust_log = std::env::var("RUST_LOG").unwrap_or_else(|_| "info".to_owned());
-    std::env::set_var("RUST_LOG", rust_log);
+
+    // SAFETY: we call this from the main thread without any other threads running.
+    #[expect(unsafe_code)]
+    unsafe {
+        std::env::set_var("RUST_LOG", rust_log);
+    };
+
    env_logger::init(); // Log to stderr (if you run with `RUST_LOG=debug`).
    start_puffin_server(); // NOTE: you may only want to call this if the users specifies some flag or clicks a button!

--- a/examples/screenshot/Cargo.toml
+++ b/examples/screenshot/Cargo.toml
@@ -6,8 +6,8 @@ authors = [
    "Andreas Faber <andreas.mfaber@gmail.com",
 ]
 license = "MIT OR Apache-2.0"
-edition = "2021"
-rust-version = "1.84"
+edition = "2024"
+rust-version = "1.85"
 publish = false

 [lints]
--- a/examples/serial_windows/Cargo.toml
+++ b/examples/serial_windows/Cargo.toml
@@ -3,8 +3,8 @@ name = "serial_windows"
 version = "0.1.0"
 authors = ["Emil Ernerfeldt <emil.ernerfeldt@gmail.com>"]
 license = "MIT OR Apache-2.0"
-edition = "2021"
-rust-version = "1.84"
+edition = "2024"
+rust-version = "1.85"
 publish = false

 [lints]
--- a/examples/user_attention/Cargo.toml
+++ b/examples/user_attention/Cargo.toml
@@ -3,8 +3,8 @@ name = "user_attention"
 version = "0.1.0"
 authors = ["TicClick <ya@ticclick.ch>"]
 license = "MIT OR Apache-2.0"
-edition = "2021"
-rust-version = "1.84"
+edition = "2024"
+rust-version = "1.85"
 publish = false

 [lints]
--- a/examples/user_attention/screenshot.png
+++ b/examples/user_attention/screenshot.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:85a508fa7d16d9bc51f38d3531b30f024d8888f7f74bf2f351453fd13d13e0aa
-size 5928
+oid sha256:1d723a89d05be6e254846b8999041c54d5142baefcb8ad8c1effa5a50bae7791
+size 6578
--- a/examples/user_attention/src/main.rs
+++ b/examples/user_attention/src/main.rs
@@ -1,7 +1,7 @@
 #![cfg_attr(not(debug_assertions), windows_subsystem = "windows")] // hide console window on Windows in release
 #![allow(rustdoc::missing_crate_level_docs)] // it's an example

-use eframe::{egui, CreationContext, NativeOptions};
+use eframe::{CreationContext, NativeOptions, egui};
 use egui::{Button, CentralPanel, Context, UserAttentionType};

 use std::time::{Duration, SystemTime};