diff --git a/crates/eframe/src/epi.rs b/crates/eframe/src/epi.rs index 1a45ee83b6e..62aece053c7 100644 --- a/crates/eframe/src/epi.rs +++ b/crates/eframe/src/epi.rs @@ -74,7 +74,13 @@ pub trait App { /// Can be used from web to interact or other external context /// Implementation is needed, because downcasting Box -> Box to get &ConcreteApp is not simple in current rust. /// - /// Just return &mut *self + /// Just copy-paste this as your implementation: + /// ```ignore + /// #[cfg(target_arch = "wasm32")] + /// fn as_any_mut(&mut self) -> &mut dyn std::any::Any { + /// &mut *self + /// } + /// ``` #[cfg(target_arch = "wasm32")] fn as_any_mut(&mut self) -> &mut dyn Any; diff --git a/crates/egui-wgpu/src/renderer.rs b/crates/egui-wgpu/src/renderer.rs index 031b71becff..80813bd37e0 100644 --- a/crates/egui-wgpu/src/renderer.rs +++ b/crates/egui-wgpu/src/renderer.rs @@ -2,7 +2,7 @@ use std::{borrow::Cow, collections::HashMap, num::NonZeroU32}; -use egui::{epaint::Primitive, NumExt, PaintCallbackInfo}; +use egui::{epaint::Primitive, PaintCallbackInfo}; use type_map::concurrent::TypeMap; use wgpu; use wgpu::util::DeviceExt as _; @@ -405,9 +405,9 @@ impl Renderer { let rect = ScissorRect::new(clip_rect, pixels_per_point, size_in_pixels); if rect.width == 0 || rect.height == 0 { - // Skip rendering with zero-sized clip areas. + // Skip rendering zero-sized clip areas. if let Primitive::Mesh(_) = primitive { - // If this is a mesh, we need to advance the index and vertex buffer iterators + // If this is a mesh, we need to advance the index and vertex buffer iterators: index_buffers.next().unwrap(); vertex_buffers.next().unwrap(); } @@ -906,14 +906,11 @@ impl ScissorRect { let clip_max_x = clip_max_x.clamp(clip_min_x, target_size[0]); let clip_max_y = clip_max_y.clamp(clip_min_y, target_size[1]); - let width = (clip_max_x - clip_min_x).at_least(1); - let height = (clip_max_y - clip_min_y).at_least(1); - - ScissorRect { + Self { x: clip_min_x, y: clip_min_y, - width, - height, + width: clip_max_x - clip_min_x, + height: clip_max_y - clip_min_y, } } }