Update to latest egui/main (#11461)

More testing before next egui release.

All the new changes:
*
emilk/egui@f6fe3bf...683214b

I updated a bunch of dependencies in Rerun using `cargo upgrade`, thus
actually changing their minimum version in `Cargo.toml`. That means
there is a lot of updated 3rd party crates here too… for better or for
worse.

I can try to split those out in a separate PR… but it will be a lot of
work methingks.

Author: emilk

Cargo.lock

@@ -252,7 +252,7 @@ gltf = "1.1"
 h264-reader = "0.8"
 half = { version = "2.3.1", features = ["bytemuck"] }
 hexasphere = "16.0.0"
-home = "=0.5.9"
+home = "0.5.9"
 http = "1.2.0"
 image = { version = "0.25", default-features = false }
 indent = "0.1"
@@ -397,8 +397,8 @@ walkdir = "2.0"
 #       Do not make this an `=` dependency, because that may break Rust users’ builds when a newer
 #       version is released, even if they are not building the web viewer.
 #       For details see https://github.com/rerun-io/rerun/issues/8766
-wasm-bindgen = "0.2.100"
-wasm-bindgen-cli-support = "=0.2.100"
+wasm-bindgen = "0.2.104"
+wasm-bindgen-cli-support = "=0.2.104"
 wasm-bindgen-futures = "0.4.50"
 wayland-sys = "0.31.5"
 web-sys = "0.3"

Cargo.toml

@@ -55,7 +55,7 @@ impl SelectionPanel {
         ui: &mut egui::Ui,
         expanded: bool,
     ) {
-        let screen_width = ui.ctx().screen_rect().width();
+        let screen_width = ui.ctx().content_rect().width();
 
         let panel = egui::SidePanel::right("selection_view")
             .min_width(120.0)

crates/viewer/re_selection_panel/src/selection_panel.rs

@@ -42,15 +42,15 @@ impl ViewEntityPicker {
             egui_ctx,
             || {
                 re_ui::modal::ModalWrapper::new("Add/remove Entities")
-                    .min_height(f32::min(160.0, egui_ctx.screen_rect().height() * 0.8))
+                    .min_height(f32::min(160.0, egui_ctx.content_rect().height() * 0.8))
                     .full_span_content(true)
                     // we set the scroll area ourselves
                     .set_side_margin(false)
                     .scrollable([false, false])
             },
             |ui| {
                 // 80%, never more than 500px
-                ui.set_max_height(f32::min(ui.ctx().screen_rect().height() * 0.8, 500.0));
+                ui.set_max_height(f32::min(ui.ctx().content_rect().height() * 0.8, 500.0));
                 let Some(view_id) = &self.view_id else {
                     ui.close();
                     return;

crates/viewer/re_selection_panel/src/view_entity_picker.rs

@@ -236,21 +236,12 @@ fn create_egui_renderstate() -> egui_wgpu::RenderState {
     };
 
     let compatible_surface = None;
-    // `re_renderer`'s individual views (managed each by a `ViewBuilder`) have MSAA,
-    // but egui's final target doesn't - re_renderer resolves and copies into egui in `ViewBuilder::composite`.
-    let msaa_samples = 1;
-    // Similarly, depth is handled by re_renderer.
-    let depth_format = None;
-    // Disable dithering in order to not unnecessarily add a source of noise & variance between renderers.
-    let dithering = false;
 
     let render_state = pollster::block_on(egui_wgpu::RenderState::create(
         &config,
         &shared_wgpu_setup.instance,
         compatible_surface,
-        depth_format,
-        msaa_samples,
-        dithering,
+        egui_wgpu::RendererOptions::PREDICTABLE,
     ))
     .expect("Failed to set up egui_wgpu::RenderState");
 

crates/viewer/re_test_context/src/lib.rs

@@ -230,7 +230,7 @@ impl TimePanel {
             panel_frame.inner_margin.right = 0;
         }
 
-        let window_height = ui.ctx().screen_rect().height();
+        let window_height = ui.ctx().content_rect().height();
 
         let id: egui::Id = self.source.into();
 

crates/viewer/re_time_panel/src/time_panel.rs

@@ -73,7 +73,7 @@ impl CommandPalette {
             return None;
         }
 
-        let screen_rect = egui_ctx.screen_rect();
+        let screen_rect = egui_ctx.content_rect();
         let width = 300.0;
         let max_height = 320.0.at_most(screen_rect.height());
 

crates/viewer/re_ui/src/command_palette.rs

@@ -162,7 +162,7 @@ pub trait ContextExt {
             egui::SizeHint::Scale(1.0.ord()),
         ) {
             let rect = Align2::RIGHT_BOTTOM
-                .align_size_within_rect(texture.size, self.ctx().screen_rect())
+                .align_size_within_rect(texture.size, self.ctx().content_rect())
                 .translate(-Vec2::splat(16.0));
             let mut mesh = Mesh::with_texture(texture.id);
             let uv = Rect::from_min_max(pos2(0.0, 0.0), pos2(1.0, 1.0));

crates/viewer/re_ui/src/context_ext.rs

@@ -271,8 +271,8 @@ impl ModalWrapper {
 
                     if self.scrollable.any() {
                         // Make the modal size less jumpy and work around https://github.com/emilk/egui/issues/5138
-                        let max_height = 0.85 * ui.ctx().screen_rect().height();
-                        let min_height = 0.3 * ui.ctx().screen_rect().height().at_most(max_height);
+                        let max_height = 0.85 * ui.ctx().content_rect().height();
+                        let min_height = 0.3 * ui.ctx().content_rect().height().at_most(max_height);
 
                         egui::ScrollArea::new(self.scrollable)
                             .min_scrolled_height(max_height)
@@ -358,7 +358,7 @@ pub fn prevent_shrinking(ui: &mut egui::Ui) {
     // The Uis response at this point will conveniently contain last frame's rect
     let last_rect = ui.response().rect;
 
-    let screen_size = ui.ctx().screen_rect().size();
+    let screen_size = ui.ctx().content_rect().size();
 
     let id = ui.id().with("prevent_shrinking");
     let screen_size_changed = ui.data_mut(|d| {

crates/viewer/re_ui/src/modal.rs

@@ -278,7 +278,7 @@ impl NotificationUi {
             .frame(ui.tokens().popup_frame(ui.style()))
             // Put the popup below the button, but all the way to the right of the screen:
             .anchor(egui::PopupAnchor::Position(egui::pos2(
-                ui.ctx().screen_rect().right() - gap,
+                ui.ctx().content_rect().right() - gap,
                 ui.max_rect().bottom() + gap,
             )))
             .align(egui::RectAlign::BOTTOM_END)
@@ -309,7 +309,7 @@ impl NotificationUi {
         let notifications = &mut self.notifications;
 
         let panel_width = 356.0;
-        let panel_max_height = (ui.ctx().screen_rect().height() - 100.0)
+        let panel_max_height = (ui.ctx().content_rect().height() - 100.0)
             .at_least(0.0)
             .at_most(640.0);