Apply forget() to GIF frame.

crates/egui/src/context.rs

@@ -3355,16 +3355,30 @@ impl Context {
 
         crate::profile_function!();
 
+        if uri.is_empty() {
+            return;
+        }
+
+        let mut frame_count: usize = 0;
         let loaders = self.loaders();
 
         loaders.include.forget(uri);
         for loader in loaders.bytes.lock().iter() {
             loader.forget(uri);
         }
         for loader in loaders.image.lock().iter() {
+            if crate::is_gif_uri(uri) {
+                frame_count = loader.frame_count(uri).max(frame_count);
+            }
             loader.forget(uri);
         }
         for loader in loaders.texture.lock().iter() {
+            if crate::is_gif_uri(uri) {
+                for frame_index in 0..frame_count {
+                    let frame_uri = crate::encode_gif_uri(uri, frame_index);
+                    loader.forget(&frame_uri);
+                }
+            }
             loader.forget(uri);
         }
     }

crates/egui/src/load.rs

@@ -395,6 +395,9 @@ pub trait ImageLoader {
 
     /// If the loader caches any data, this should return the size of that cache.
     fn byte_size(&self) -> usize;
+
+    /// Returns the number of frames in the Image.
+    fn frame_count(&self, uri: &str) -> usize;
 }
 
 /// A texture with a known size.

crates/egui/src/widgets/image.rs

@@ -797,7 +797,7 @@ pub fn paint_texture_at(
 }
 
 /// gif uris contain the uri & the frame that will be displayed
-fn encode_gif_uri(uri: &str, frame_index: usize) -> String {
+pub fn encode_gif_uri(uri: &str, frame_index: usize) -> String {
     format!("{uri}#{frame_index}")
 }
 
@@ -815,7 +815,7 @@ pub fn decode_gif_uri(uri: &str) -> Result<(&str, usize), String> {
 }
 
 /// checks if uri is a gif file
-fn is_gif_uri(uri: &str) -> bool {
+pub fn is_gif_uri(uri: &str) -> bool {
     uri.ends_with(".gif") || uri.contains(".gif#")
 }
 

crates/egui/src/widgets/mod.rs

@@ -28,8 +28,8 @@ pub use self::{
     drag_value::DragValue,
     hyperlink::{Hyperlink, Link},
     image::{
-        decode_gif_uri, has_gif_magic_header, paint_texture_at, GifFrameDurations, Image, ImageFit,
-        ImageOptions, ImageSize, ImageSource,
+        decode_gif_uri, encode_gif_uri, has_gif_magic_header, is_gif_uri, paint_texture_at,
+        GifFrameDurations, Image, ImageFit, ImageOptions, ImageSize, ImageSource,
     },
     image_button::ImageButton,
     label::Label,

crates/egui_extras/src/loaders/gif_loader.rs

@@ -131,4 +131,13 @@ impl ImageLoader for GifLoader {
             })
             .sum()
     }
+
+    fn frame_count(&self, uri: &str) -> usize {
+        let cache = self.cache.lock();
+        if let Some(Ok(image)) = cache.get(uri) {
+            image.frames.len()
+        } else {
+            0
+        }
+    }
 }

crates/egui_extras/src/loaders/image_loader.rs

@@ -109,6 +109,10 @@ impl ImageLoader for ImageCrateLoader {
             })
             .sum()
     }
+
+    fn frame_count(&self, _uri: &str) -> usize {
+        1
+    }
 }
 
 #[cfg(test)]

crates/egui_extras/src/loaders/svg_loader.rs

@@ -83,6 +83,10 @@ impl ImageLoader for SvgLoader {
             })
             .sum()
     }
+
+    fn frame_count(&self, _uri: &str) -> usize {
+        1
+    }
 }
 
 #[cfg(test)]