Use new Image API from egui

Cargo.toml

@@ -13,37 +13,27 @@ documentation = "https://docs.rs/egui_commonmark"
 include = ["src/*.rs", "LICENSE-MIT", "LICENSE-APACHE", "Cargo.toml"]
 
 [dependencies]
-egui = { git = "https://github.com/emilk/egui", rev = "2c7c598" }
-image = { version = "0.24", default-features = false, features = ["png"] }
-parking_lot = "0.12"
-poll-promise = "0.3"
+egui = { git = "https://github.com/emilk/egui", rev = "ab48e60" }
 pulldown-cmark = { version = "0.9.3", default-features = false }
-
+egui_extras = { git = "https://github.com/emilk/egui", rev = "ab48e60" }
 
 syntect = { version = "5.0.0", optional = true, default-features = false, features = [
     "default-fancy",
 ] }
 
-resvg = { version = "0.35.0", optional = true }
-usvg = { version = "0.35.0", optional = true }
-
-url = { version = "2.4", optional = true }
-ehttp = { version = "0.3.0", optional = true }
-
 document-features = { version = "0.2", optional = true }
 
 [features]
 ## Syntax highlighting for code blocks
 syntax_highlighting = ["syntect"]
 
-## Support loading svg images
-svg = ["resvg", "usvg"]
-
-## Images with urls will be downloaded and displayed
-fetch = ["ehttp", "url", "image/jpeg"]
-
 [dev-dependencies]
-eframe = { git = "https://github.com/emilk/egui", rev = "2c7c598" }
+egui_extras = { git = "https://github.com/emilk/egui", rev = "ab48e60", features = [
+    "all-loaders",
+    "log",
+] }
+eframe = { git = "https://github.com/emilk/egui", rev = "ab48e60" }
+image = { version = "0.24", default-features = false, features = ["png"] }
 
 [package.metadata.docs.rs]
 # docs.rs build can fail with the fetch feature enabled

examples/hello_world.rs

@@ -64,14 +64,16 @@ fn main() {
         "Markdown viewer",
         eframe::NativeOptions::default(),
         Box::new(move |cc| {
+            // egui_extras::loaders::install(&cc.egui_ctx);
+
             cc.egui_ctx.set_visuals(if use_dark_theme {
                 egui::Visuals::dark()
             } else {
                 egui::Visuals::light()
             });
 
             Box::new(App {
-                cache: CommonMarkCache::default(),
+                cache: CommonMarkCache::new(&cc.egui_ctx),
             })
         }),
     )

examples/link_hooks.rs

@@ -29,13 +29,13 @@ Check out the [previous](#prev) page."#;
 }
 
 fn main() {
-    let mut cache = CommonMarkCache::default();
-    cache.add_link_hook("#next");
-    cache.add_link_hook("#prev");
     eframe::run_native(
         "Markdown link hooks",
         eframe::NativeOptions::default(),
-        Box::new(|_| {
+        Box::new(|cc| {
+            let mut cache = CommonMarkCache::new(&cc.egui_ctx);
+            cache.add_link_hook("#next");
+            cache.add_link_hook("#prev");
             Box::new(App {
                 cache,
                 curr_page: 0,

examples/scroll.rs

@@ -65,7 +65,7 @@ fn main() {
             });
 
             Box::new(App {
-                cache: CommonMarkCache::default(),
+                cache: CommonMarkCache::new(&cc.egui_ctx),
             })
         }),
     )