Merge branch 'main' into lucas/malmal/main

crates/eframe/CHANGELOG.md

@@ -7,6 +7,35 @@ This file is updated upon each release.
 Changes since the last release can be found at <https://github.com/emilk/egui/compare/latest...HEAD> or by running the `scripts/generate_changelog.py` script.
 
 
+## 0.34.1 - 2026-03-27
+* `wgpu` backend: Enable WebGL fallback [#8038](https://github.com/emilk/egui/pull/8038) by [@emilk](https://github.com/emilk)
+* Only apply cursor style to the `<canvas>` [#8036](https://github.com/emilk/egui/pull/8036) by [@mkeeter](https://github.com/mkeeter)
+
+
+## 0.34.0 - 2026-03-26
+### ⭐ Added
+* Add feature `wgpu_no_default_features` [#7700](https://github.com/emilk/egui/pull/7700) by [@emilk](https://github.com/emilk)
+* Add `ViewportInfo::occluded` and `visible` [#7948](https://github.com/emilk/egui/pull/7948) by [@emilk](https://github.com/emilk)
+* Add `eframe::WindowChromeMetrics` (macOS only) [#8015](https://github.com/emilk/egui/pull/8015) by [@emilk](https://github.com/emilk)
+
+### 🔧 Changed
+* Replace `App::update` with `fn logic` and `fn ui` [#7775](https://github.com/emilk/egui/pull/7775) by [@emilk](https://github.com/emilk)
+* Make `wgpu` the default renderer for `eframe` and egui.rs [#7615](https://github.com/emilk/egui/pull/7615) by [@emilk](https://github.com/emilk)
+* Roll out new egui icon and logo [#7995](https://github.com/emilk/egui/pull/7995) by [@emilk](https://github.com/emilk)
+* Update wasm-bindgen to 0.2.108, and ehttp to 0.7.1 [#7996](https://github.com/emilk/egui/pull/7996) by [@emilk](https://github.com/emilk)
+* Update to `wgpu` 29 [#7990](https://github.com/emilk/egui/pull/7990) by [@cwfitzgerald](https://github.com/cwfitzgerald)
+* Allow fallback from smithay to arboard when getting clipboard [#7976](https://github.com/emilk/egui/pull/7976) by [@wizzeh](https://github.com/wizzeh)
+
+### 🐛 Fixed
+* Fix: update get_proc_address to use Arc for better ownership management [#7922](https://github.com/emilk/egui/pull/7922) by [@Wybxc](https://github.com/Wybxc)
+* Much improved IME [#7967](https://github.com/emilk/egui/pull/7967) by [@umajho](https://github.com/umajho)
+* Improve behavior of invisible windows [#7905](https://github.com/emilk/egui/pull/7905) by [@gcailly](https://github.com/gcailly)
+
+### 🚀 Performance
+* Avoid repaints on device mouse motion outside window [#7866](https://github.com/emilk/egui/pull/7866) by [@inktomi](https://github.com/inktomi)
+* Only run `App::ui` if the application is visible [#7950](https://github.com/emilk/egui/pull/7950) by [@emilk](https://github.com/emilk)
+
+
 ## 0.33.3 - 2025-12-11
 Nothing new
 

crates/eframe/Cargo.toml

@@ -89,7 +89,7 @@ web_screen_reader = ["web-sys/SpeechSynthesis", "web-sys/SpeechSynthesisUtteranc
 ## See <https://github.com/emilk/egui/issues/5889> for more details.
 ##
 ## By default, eframe will prefer WebGPU over WebGL, but
-## you can configure this at run-time with [`NativeOptions::wgpu_options`].
+## you can configure this at run-time with `WebOptions::wgpu_options`.
 wgpu = ["wgpu_no_default_features", "egui-wgpu/default"]
 
 ## This is exactly like the `wgpu` feature, but does NOT enable the default features of `wgpu` and `egui-wgpu`.
@@ -155,7 +155,6 @@ glutin-winit = { workspace = true, optional = true, default-features = false, fe
   "wgl",
 ] }
 home = { workspace = true, optional = true }
-wgpu = { workspace = true, optional = true }
 
 # mac:
 [target.'cfg(any(target_os = "macos"))'.dependencies]
@@ -170,12 +169,16 @@ objc2-app-kit = { workspace = true, default-features = false, features = [
   "std",
   "NSApplication",
   "NSBitmapImageRep",
+  "NSButton",
+  "NSControl",
   "NSGraphics",
   "NSImage",
   "NSImageRep",
   "NSMenu",
   "NSMenuItem",
   "NSResponder",
+  "NSView",
+  "NSWindow",
 ] }
 
 # windows:

crates/eframe/src/lib.rs

@@ -159,7 +159,7 @@ pub use {egui, egui::emath, egui::epaint};
 pub use {egui_glow, glow};
 
 #[cfg(feature = "wgpu_no_default_features")]
-pub use {egui_wgpu, wgpu};
+pub use {egui_wgpu, egui_wgpu::wgpu};
 
 mod epi;
 
@@ -190,6 +190,9 @@ pub use web::{WebLogger, WebRunner};
 #[cfg(any(feature = "glow", feature = "wgpu_no_default_features"))]
 mod native;
 
+#[cfg(target_os = "macos")]
+pub use native::macos::WindowChromeMetrics;
+
 #[cfg(not(target_arch = "wasm32"))]
 #[cfg(any(feature = "glow", feature = "wgpu_no_default_features"))]
 pub use native::run::EframeWinitApplication;

crates/eframe/src/native/macos.rs

@@ -0,0 +1,76 @@
+use egui::Vec2;
+use objc2_app_kit::{NSView, NSWindow, NSWindowButton};
+use raw_window_handle::{AppKitWindowHandle, RawWindowHandle};
+
+/// Size of the "traffic lights" (red/yellow/green close/minimize/maximize buttons)
+/// on the native macOS window.
+///
+/// This is very useful together with [`egui::ViewportBuilder::with_fullsize_content_view`].
+#[derive(Debug)]
+pub struct WindowChromeMetrics {
+    /// Size of the "traffic lights" (red/yellow/green close/minimize/maximize buttons),
+    /// including margins.
+    ///
+    /// The unit here is in "native scale", which means it needs to be divided by [`egui::Context::zoom_factor`]
+    /// to get the size in egui points.
+    pub traffic_lights_size: Vec2,
+}
+
+impl WindowChromeMetrics {
+    /// Get the window chrome metrics for a given window handle.
+    pub fn from_window_handle(window_handle: &RawWindowHandle) -> Option<Self> {
+        window_chrome_metrics(window_handle)
+    }
+}
+
+fn window_chrome_metrics(window_handle: &RawWindowHandle) -> Option<WindowChromeMetrics> {
+    let RawWindowHandle::AppKit(appkit_handle) = window_handle else {
+        return None;
+    };
+
+    let ns_view = ns_view_from_handle(appkit_handle)?;
+    let ns_window = ns_view.window()?;
+
+    Some(WindowChromeMetrics {
+        traffic_lights_size: traffic_lights_metrics(&ns_window)?,
+    })
+}
+
+fn traffic_lights_metrics(ns_window: &NSWindow) -> Option<Vec2> {
+    // Button order is CloseButton, MiniaturizeButton, ZoomButton:
+    let close_button = ns_window
+        .standardWindowButton(NSWindowButton::CloseButton)?
+        .frame();
+    let zoom_button = ns_window
+        .standardWindowButton(NSWindowButton::ZoomButton)?
+        .frame();
+
+    let left_margin = close_button.origin.x;
+    let right_margin = left_margin; // for symmetry
+
+    let total_width = zoom_button.origin.x + zoom_button.size.width + right_margin;
+
+    let top_margin = close_button.origin.y;
+    let bottom_margin = top_margin; // Usually symmetric
+    let total_height = top_margin + close_button.size.height + bottom_margin;
+
+    Some(Vec2::new(total_width as f32, total_height as f32))
+}
+
+fn ns_view_from_handle(handle: &AppKitWindowHandle) -> Option<&NSView> {
+    let ns_view_ptr = handle.ns_view.as_ptr().cast::<NSView>();
+
+    // Validate the pointer is non-null
+    if ns_view_ptr.is_null() {
+        None
+    } else {
+        // SAFETY:
+        // - We've verified the pointer is non-null
+        // - The pointer comes from the windowing system, so it should be valid
+        // - NSView pointers from AppKit are expected to remain valid for the window lifetime
+        #[expect(unsafe_code)]
+        unsafe {
+            ns_view_ptr.as_ref()
+        }
+    }
+}

crates/eframe/src/native/mod.rs

@@ -3,6 +3,9 @@ mod epi_integration;
 mod event_loop_context;
 pub mod run;
 
+#[cfg(target_os = "macos")]
+pub(crate) mod macos;
+
 /// File storage which can be used by native backends.
 #[cfg(feature = "persistence")]
 pub mod file_storage;

crates/eframe/src/web/app_runner.rs

@@ -393,7 +393,7 @@ impl AppRunner {
             }
         }
 
-        super::set_cursor_icon(cursor_icon);
+        super::set_cursor_icon(self.canvas(), cursor_icon);
 
         if self.has_focus() {
             // The eframe app has focus.

crates/eframe/src/web/mod.rs

@@ -178,10 +178,8 @@ fn canvas_size_in_points(canvas: &web_sys::HtmlCanvasElement, ctx: &egui::Contex
 // ----------------------------------------------------------------------------
 
 /// Set the cursor icon.
-fn set_cursor_icon(cursor: egui::CursorIcon) -> Option<()> {
-    let document = web_sys::window()?.document()?;
-    document
-        .body()?
+fn set_cursor_icon(canvas: &web_sys::HtmlCanvasElement, cursor: egui::CursorIcon) -> Option<()> {
+    canvas
         .style()
         .set_property("cursor", cursor_web_name(cursor))
         .ok()