Small cleanup and renamings

crates/eframe/src/native/epi_integration.rs

@@ -87,7 +87,7 @@ pub fn window_builder<E>(
         ..
     } = native_options;
 
-    let mut window_builder = egui::ViewportBuilder::new(ViewportId::ROOT)
+    let mut viewport_builder = egui::ViewportBuilder::new(ViewportId::ROOT)
         .with_title(title)
         .with_close_button(true) // The default for all other viewports is `false`!
         .with_decorations(*decorated)
@@ -108,7 +108,7 @@ pub fn window_builder<E>(
 
     #[cfg(target_os = "macos")]
     if *fullsize_content {
-        window_builder = window_builder
+        viewport_builder = viewport_builder
             .with_title_hidden(true)
             .with_titlebar_transparent(true)
             .with_fullsize_content_view(true);
@@ -123,13 +123,13 @@ pub fn window_builder<E>(
     }
 
     if let Some(min_size) = *min_window_size {
-        window_builder = window_builder.with_min_inner_size(Some(min_size));
+        viewport_builder = viewport_builder.with_min_inner_size(Some(min_size));
     }
     if let Some(max_size) = *max_window_size {
-        window_builder = window_builder.with_max_inner_size(Some(max_size));
+        viewport_builder = viewport_builder.with_max_inner_size(Some(max_size));
     }
 
-    window_builder = window_builder.with_drag_and_drop(*drag_and_drop_support);
+    viewport_builder = viewport_builder.with_drag_and_drop(*drag_and_drop_support);
 
     // Always use the default window size / position on iOS. Trying to restore the previous position
     // causes the window to be shown too small.
@@ -140,17 +140,17 @@ pub fn window_builder<E>(
         window_settings.clamp_size_to_sane_values(largest_monitor_point_size(event_loop));
         window_settings.clamp_position_to_monitors(event_loop);
 
-        window_builder = window_settings.initialize_window_builder(window_builder);
+        viewport_builder = window_settings.initialize_viewport_builder(viewport_builder);
         window_settings.inner_size_points()
     } else {
         if let Some(pos) = *initial_window_pos {
-            window_builder = window_builder.with_position(Some(pos));
+            viewport_builder = viewport_builder.with_position(Some(pos));
         }
 
         if let Some(initial_window_size) = *initial_window_size {
             let initial_window_size =
                 initial_window_size.at_most(largest_monitor_point_size(event_loop));
-            window_builder = window_builder.with_inner_size(Some(initial_window_size));
+            viewport_builder = viewport_builder.with_inner_size(Some(initial_window_size));
         }
 
         *initial_window_size
@@ -164,14 +164,14 @@ pub fn window_builder<E>(
             if monitor_size.width > 0.0 && monitor_size.height > 0.0 {
                 let x = (monitor_size.width - inner_size.x) / 2.0;
                 let y = (monitor_size.height - inner_size.y) / 2.0;
-                window_builder = window_builder.with_position(Some(egui::Pos2::new(x, y)));
+                viewport_builder = viewport_builder.with_position(Some(egui::Pos2::new(x, y)));
             }
         }
     }
 
     match std::mem::take(&mut native_options.window_builder) {
-        Some(hook) => hook(window_builder),
+        Some(hook) => hook(viewport_builder),
-        None => window_builder,
+        None => viewport_builder,
     }
 }
 

crates/eframe/src/web/app_runner.rs

@@ -171,8 +171,6 @@ impl AppRunner {
         self.painter.destroy();
     }
 
-    /// Returns how long to wait until the next repaint.
-    ///
     /// Call [`Self::paint`] later to paint
     pub fn logic(&mut self) -> Vec<egui::ClippedPrimitive> {
         let frame_start = now_sec();

crates/egui-wgpu/src/winit.rs

@@ -244,11 +244,11 @@ impl Painter {
             }
 
             let Some(width) = NonZeroU32::new(size.width) else {
-                log::debug!("The window width was zero; skiping generate textures");
+                log::debug!("The window width was zero; skipping generate textures");
                 return Ok(());
             };
             let Some(height) = NonZeroU32::new(size.height) else {
-                log::debug!("The window height was zero; skiping generate textures");
+                log::debug!("The window height was zero; skipping generate textures");
                 return Ok(());
             };
             self.resize_and_generate_depth_texture_view_and_msaa_view(viewport_id, width, height);
@@ -325,8 +325,8 @@ impl Painter {
                     .create_texture(&wgpu::TextureDescriptor {
                         label: Some("egui_msaa_texture"),
                         size: wgpu::Extent3d {
-                            width: width_in_pixels.get(),
+                            width,
-                            height: height_in_pixels.get(),
+                            height,
                             depth_or_array_layers: 1,
                         },
                         mip_level_count: 1,

crates/egui-winit/src/window_settings.rs

@@ -48,7 +48,7 @@ impl WindowSettings {
         self.inner_size_points
     }
 
-    pub fn initialize_window_builder(&self, mut window: ViewportBuilder) -> ViewportBuilder {
+    pub fn initialize_viewport_builder(&self, mut window: ViewportBuilder) -> ViewportBuilder {
         // `WindowBuilder::with_position` expects inner position in Macos, and outer position elsewhere
         // See [`winit::window::WindowBuilder::with_position`] for details.
         let pos_px = if cfg!(target_os = "macos") {

crates/egui/src/context.rs

@@ -1626,6 +1626,8 @@ impl Context {
     }
 
     /// Tessellate the given shapes into triangle meshes.
+    ///
+    /// The `viewport_id` is used to get the correct `pixels_per_point`.
     pub fn tessellate(
         &self,
         shapes: Vec<ClippedShape>,

crates/egui/src/data/output.rs

@@ -1,7 +1,6 @@
 //! All the data egui returns to the backend at the end of each frame.
 
-use crate::ViewportId;
+use crate::{ViewportCommand, ViewportId, ViewportOutput, WidgetType};
-use crate::{ViewportCommand, ViewportOutput, WidgetType};
 
 /// What egui emits each frame from [`crate::Context::run`].
 ///