Merge branch 'master' of https://github.com/emilk/egui into multiples_viewports

2026-08-30 05:10:03 -04:00 · 2023-09-06 13:35:02 +03:00
parent 6e244d12cd ec671e754f
commit fea6ed7878
69 changed files with 1445 additions and 166 deletions
--- a/examples/confirm_exit/Cargo.toml
+++ b/examples/confirm_exit/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 authors = ["Emil Ernerfeldt <emil.ernerfeldt@gmail.com>"]
 license = "MIT OR Apache-2.0"
 edition = "2021"
-rust-version = "1.67"
+rust-version = "1.70"
 publish = false


--- a/examples/custom_3d_glow/Cargo.toml
+++ b/examples/custom_3d_glow/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 authors = ["Emil Ernerfeldt <emil.ernerfeldt@gmail.com>"]
 license = "MIT OR Apache-2.0"
 edition = "2021"
-rust-version = "1.67"
+rust-version = "1.70"
 publish = false


--- a/examples/custom_font/Cargo.toml
+++ b/examples/custom_font/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 authors = ["Emil Ernerfeldt <emil.ernerfeldt@gmail.com>"]
 license = "MIT OR Apache-2.0"
 edition = "2021"
-rust-version = "1.67"
+rust-version = "1.70"
 publish = false


--- a/examples/custom_font_style/Cargo.toml
+++ b/examples/custom_font_style/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 authors = ["tami5 <kkharji@proton.me>"]
 license = "MIT OR Apache-2.0"
 edition = "2021"
-rust-version = "1.67"
+rust-version = "1.70"
 publish = false


--- a/examples/custom_window_frame/Cargo.toml
+++ b/examples/custom_window_frame/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 authors = ["Emil Ernerfeldt <emil.ernerfeldt@gmail.com>"]
 license = "MIT OR Apache-2.0"
 edition = "2021"
-rust-version = "1.67"
+rust-version = "1.70"
 publish = false


--- a/examples/download_image/Cargo.toml
+++ b/examples/download_image/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 authors = ["Emil Ernerfeldt <emil.ernerfeldt@gmail.com>"]
 license = "MIT OR Apache-2.0"
 edition = "2021"
-rust-version = "1.67"
+rust-version = "1.70"
 publish = false


@@ -12,8 +12,10 @@ publish = false
 eframe = { path = "../../crates/eframe", features = [
    "__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO
 ] }
-egui_extras = { path = "../../crates/egui_extras", features = ["image"] }
-ehttp = "0.2"
+egui_extras = { path = "../../crates/egui_extras", features = [
+    "http",
+    "image",
+    "log",
+] }
 env_logger = "0.10"
 image = { version = "0.24", default-features = false, features = ["jpeg"] }
-poll-promise = "0.2"
--- a/examples/download_image/src/main.rs
+++ b/examples/download_image/src/main.rs
@@ -1,8 +1,6 @@
 #![cfg_attr(not(debug_assertions), windows_subsystem = "windows")] // hide console window on Windows in release

 use eframe::egui;
-use egui_extras::RetainedImage;
-use poll_promise::Promise;

 fn main() -> Result<(), eframe::Error> {
    env_logger::init(); // Log to stderr (if you run with `RUST_LOG=debug`).
@@ -10,55 +8,34 @@ fn main() -> Result<(), eframe::Error> {
    eframe::run_native(
        "Download and show an image with eframe/egui",
        options,
-        Box::new(|_cc| Box::<MyApp>::default()),
+        Box::new(|cc| {
+            // Without the following call, the `Image2` created below
+            // will simply output `not supported` error messages.
+            egui_extras::loaders::install(&cc.egui_ctx);
+            Box::new(MyApp)
+        }),
    )
 }

 #[derive(Default)]
-struct MyApp {
-    /// `None` when download hasn't started yet.
-    promise: Option<Promise<ehttp::Result<RetainedImage>>>,
-}
+struct MyApp;

 impl eframe::App for MyApp {
    fn update(&mut self, ctx: &egui::Context, _frame: &mut eframe::Frame) {
-        let promise = self.promise.get_or_insert_with(|| {
-            // Begin download.
-            // We download the image using `ehttp`, a library that works both in WASM and on native.
-            // We use the `poll-promise` library to communicate with the UI thread.
-            let ctx = ctx.clone();
-            let (sender, promise) = Promise::new();
-            let request = ehttp::Request::get("https://picsum.photos/seed/1.759706314/1024");
-            ehttp::fetch(request, move |response| {
-                let image = response.and_then(parse_response);
-                sender.send(image); // send the results back to the UI thread.
-                ctx.request_repaint(); // wake up UI thread
+        egui::CentralPanel::default().show(ctx, |ui| {
+            let width = ui.available_width();
+            let half_height = ui.available_height() / 2.0;
+
+            ui.allocate_ui(egui::Vec2::new(width, half_height), |ui| {
+                ui.add(egui::Image2::from_uri(
+                    "https://picsum.photos/seed/1.759706314/1024",
+                ))
+            });
+            ui.allocate_ui(egui::Vec2::new(width, half_height), |ui| {
+                ui.add(egui::Image2::from_uri(
+                    "https://this-is-hopefully-not-a-real-website.rs/image.png",
+                ))
            });
-            promise
-        });
-
-        egui::CentralPanel::default().show(ctx, |ui| match promise.ready() {
-            None => {
-                ui.spinner(); // still loading
-            }
-            Some(Err(err)) => {
-                ui.colored_label(ui.visuals().error_fg_color, err); // something went wrong
-            }
-            Some(Ok(image)) => {
-                image.show_max_size(ui, ui.available_size());
-            }
        });
    }
 }
-
-#[allow(clippy::needless_pass_by_value)]
-fn parse_response(response: ehttp::Response) -> Result<RetainedImage, String> {
-    let content_type = response.content_type().unwrap_or_default();
-    if content_type.starts_with("image/") {
-        RetainedImage::from_image_bytes(&response.url, &response.bytes)
-    } else {
-        Err(format!(
-            "Expected image, found content-type {content_type:?}"
-        ))
-    }
-}
--- a/examples/file_dialog/Cargo.toml
+++ b/examples/file_dialog/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 authors = ["Emil Ernerfeldt <emil.ernerfeldt@gmail.com>"]
 license = "MIT OR Apache-2.0"
 edition = "2021"
-rust-version = "1.67"
+rust-version = "1.70"
 publish = false


--- a/examples/hello_world/Cargo.toml
+++ b/examples/hello_world/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 authors = ["Emil Ernerfeldt <emil.ernerfeldt@gmail.com>"]
 license = "MIT OR Apache-2.0"
 edition = "2021"
-rust-version = "1.67"
+rust-version = "1.70"
 publish = false


--- a/examples/hello_world_par/Cargo.toml
+++ b/examples/hello_world_par/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 authors = ["Maxim Osipenko <maxim1999max@gmail.com>"]
 license = "MIT OR Apache-2.0"
 edition = "2021"
-rust-version = "1.67"
+rust-version = "1.70"
 publish = false


--- a/examples/hello_world_simple/Cargo.toml
+++ b/examples/hello_world_simple/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 authors = ["Emil Ernerfeldt <emil.ernerfeldt@gmail.com>"]
 license = "MIT OR Apache-2.0"
 edition = "2021"
-rust-version = "1.67"
+rust-version = "1.70"
 publish = false


--- a/examples/keyboard_events/Cargo.toml
+++ b/examples/keyboard_events/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 authors = ["Jose Palazon <jose@palako.com>"]
 license = "MIT OR Apache-2.0"
 edition = "2021"
-rust-version = "1.67"
+rust-version = "1.70"
 publish = false


--- a/examples/puffin_profiler/Cargo.toml
+++ b/examples/puffin_profiler/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 authors = ["Emil Ernerfeldt <emil.ernerfeldt@gmail.com>"]
 license = "MIT OR Apache-2.0"
 edition = "2021"
-rust-version = "1.67"
+rust-version = "1.70"
 publish = false


--- a/examples/retained_image/Cargo.toml
+++ b/examples/retained_image/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 authors = ["Emil Ernerfeldt <emil.ernerfeldt@gmail.com>"]
 license = "MIT OR Apache-2.0"
 edition = "2021"
-rust-version = "1.67"
+rust-version = "1.70"
 publish = false


@@ -12,6 +12,6 @@ publish = false
 eframe = { path = "../../crates/eframe", features = [
    "__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO
 ] }
-egui_extras = { path = "../../crates/egui_extras", features = ["image"] }
+egui_extras = { path = "../../crates/egui_extras", features = ["image", "log"] }
 env_logger = "0.10"
 image = { version = "0.24", default-features = false, features = ["png"] }
--- a/examples/save_plot/Cargo.toml
+++ b/examples/save_plot/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 authors = ["hacknus <l_stoeckli@bluewin.ch>"]
 license = "MIT OR Apache-2.0"
 edition = "2021"
-rust-version = "1.67"
+rust-version = "1.70"
 publish = false

 [dependencies]
--- a/examples/screenshot/Cargo.toml
+++ b/examples/screenshot/Cargo.toml
@@ -7,7 +7,7 @@ authors = [
 ]
 license = "MIT OR Apache-2.0"
 edition = "2021"
-rust-version = "1.67"
+rust-version = "1.70"
 publish = false


@@ -17,5 +17,4 @@ eframe = { path = "../../crates/eframe", features = [
    "wgpu",
 ] }
 env_logger = "0.10"
-itertools = "0.10.3"
 image = { version = "0.24", default-features = false, features = ["png"] }
--- a/examples/serial_windows/Cargo.toml
+++ b/examples/serial_windows/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 authors = ["Emil Ernerfeldt <emil.ernerfeldt@gmail.com>"]
 license = "MIT OR Apache-2.0"
 edition = "2021"
-rust-version = "1.67"
+rust-version = "1.70"
 publish = false


--- a/examples/svg/Cargo.toml
+++ b/examples/svg/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 authors = ["Emil Ernerfeldt <emil.ernerfeldt@gmail.com>"]
 license = "MIT OR Apache-2.0"
 edition = "2021"
-rust-version = "1.67"
+rust-version = "1.70"
 publish = false


@@ -12,5 +12,5 @@ publish = false
 eframe = { path = "../../crates/eframe", features = [
    "__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO
 ] }
-egui_extras = { path = "../../crates/egui_extras", features = ["svg"] }
+egui_extras = { path = "../../crates/egui_extras", features = ["log", "svg"] }
 env_logger = "0.10"
--- a/examples/svg/src/main.rs
+++ b/examples/svg/src/main.rs
@@ -15,26 +15,16 @@ fn main() -> Result<(), eframe::Error> {
    eframe::run_native(
        "svg example",
        options,
-        Box::new(|_cc| Box::<MyApp>::default()),
+        Box::new(|cc| {
+            // Without the following call, the `Image2` created below
+            // will simply output a `not supported` error message.
+            egui_extras::loaders::install(&cc.egui_ctx);
+            Box::new(MyApp)
+        }),
    )
 }

-struct MyApp {
-    svg_image: egui_extras::RetainedImage,
-}
-
-impl Default for MyApp {
-    fn default() -> Self {
-        Self {
-            svg_image: egui_extras::RetainedImage::from_svg_bytes_with_size(
-                "rustacean-flat-happy.svg",
-                include_bytes!("rustacean-flat-happy.svg"),
-                egui_extras::image::FitTo::Original,
-            )
-            .unwrap(),
-        }
-    }
-}
+struct MyApp;

 impl eframe::App for MyApp {
    fn update(&mut self, ctx: &egui::Context, _frame: &mut eframe::Frame) {
@@ -45,7 +35,13 @@ impl eframe::App for MyApp {
            ui.separator();

            let max_size = ui.available_size();
-            self.svg_image.show_size(ui, max_size);
+            ui.add(
+                egui::Image2::from_static_bytes(
+                    "ferris.svg",
+                    include_bytes!("rustacean-flat-happy.svg"),
+                )
+                .size_hint(max_size),
+            );
        });
    }
 }
--- a/examples/user_attention/Cargo.toml
+++ b/examples/user_attention/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 authors = ["TicClick <ya@ticclick.ch>"]
 license = "MIT OR Apache-2.0"
 edition = "2021"
-rust-version = "1.67"
+rust-version = "1.70"
 publish = false

 [dependencies]