Updated mirror and egui dependencies

Author: ko1N

Cargo.lock

@@ -5,4 +5,4 @@ authors = ["ko1N <[email protected]>"]
 edition = "2018"
 
 [dependencies]
-memflow = { version = "=0.2.0-beta10", features = ["plugins"] }
+memflow = { version = "0.2", features = ["plugins"] }

mirror-dto/Cargo.toml

@@ -8,7 +8,7 @@ edition = "2018"
 mirror-dto = { path = "../mirror-dto" }
 winapi = { version = "0.3.8", features = ["winuser", "libloaderapi", "d3d11", "d3dcommon", "dxgi", "dxgi1_2", "dxgitype", "ntdef", "unknwnbase", "winerror", "windef", "minwindef", "shellapi", "libloaderapi", "commctrl", "basetsd"] }
 log = "0.4"
-thread-priority = "^0.10"
+thread-priority = "0.15"
 trayicon = "0.1"
 simple-logging = "2.0"
 log-panics = "2.0"

mirror-guest/Cargo.toml

@@ -1,46 +1,46 @@
 [package]
 name = "mirror"
-version = "0.2.0-beta10"
+version = "0.2.0"
 authors = ["ko1N <[email protected]>"]
 edition = "2018"
 
 [dependencies]
 # memflow
-log = "^0.4"
-memflow = { version = "=0.2.0-beta10", features = ["plugins"] }
+log = "0.4"
+memflow = { version = "0.2", features = ["plugins"] }
 mirror-dto = { path = "../mirror-dto" }
 parking_lot = { version = "0.12", features = [ "hardware-lock-elision" ] }
 frame_counter = "0.1.2"
-pelite = "^0.9.0"
+pelite = "0.10.0"
 
 # bin
-clap = { version = "^4.0", features = ["cargo"], optional = true }
-simplelog = { version = "^0.12", optional = true }
-thread-priority = { version = "^0.13", optional = true }
+clap = { version = "4.4", features = ["cargo"], optional = true }
+simplelog = { version = "0.12", optional = true }
+thread-priority = { version = "0.16", optional = true }
 
 # gui
-egui = "0.20.0"
-eframe = { version = "0.20.0", optional = true }
-epaint = { version = "0.20.0", optional = true }
-egui-notify = { version = "0.5.0", optional = true }
-egui_dock = "0.3"
-image = { version = "^0.24", optional = true }
+egui = "0.26"
+eframe = { version = "0.26", optional = true }
+epaint = { version = "0.26", optional = true }
+egui-notify = { version = "0.14", optional = true }
+egui_dock = "0.11"
+image = { version = "0.25", optional = true }
 
 # configs
 serde = { version = "1.0", features = ["derive"] }
-toml = "^0.7"
-dirs = "^5.0"
+toml = "0.8"
+dirs = "5.0"
 
 [dev-dependencies]
-log = "^0.4"
-clap = { version = "^4.0", features = ["cargo"] }
-simplelog = { version = "^0.12" }
-memflow = { version = "=0.2.0-beta10", features = ["plugins"] }
+log = "0.4"
+clap = { version = "4.4", features = ["cargo"] }
+simplelog = { version = "0.12" }
+memflow = { version = "0.2", features = ["plugins"] }
 
 [features]
-default = []
-mirror-bin = [ "dep:clap", "dep:simplelog", "dep:thread-priority", "dep:eframe", "dep:epaint", "dep:egui-notify", "dep:image" ]
+default = ["mirror-bin"]
+mirror-bin = ["dep:clap", "dep:simplelog", "dep:thread-priority", "dep:eframe", "dep:epaint", "dep:egui-notify", "dep:image"]
 
 [[bin]]
 name = "mirror"
-required-features = [ "mirror-bin" ]
+required-features = ["mirror-bin"]

mirror/Cargo.toml

@@ -1,6 +1,6 @@
 use ::log::warn;
 
-use ::egui_dock::{DockArea, StyleBuilder, Tree};
+use ::egui_dock::{DockArea, DockState, Style};
 use ::egui_notify::Toasts;
 
 mod frame_history;
@@ -14,7 +14,7 @@ use crate::MirrorConfig;
 pub struct MirrorApp {
     _toasts: Toasts,
     frame_history: FrameHistory,
-    tree: Tree<CaptureTab>,
+    tree: DockState<CaptureTab>,
     tree_len: usize,
 
     config: MirrorConfig,
@@ -41,7 +41,7 @@ impl MirrorApp {
         Self {
             _toasts: Toasts::default().with_anchor(egui_notify::Anchor::BottomRight),
             frame_history: FrameHistory::default(),
-            tree: Tree::new(vec![capture_tab]),
+            tree: DockState::new(vec![capture_tab]),
             tree_len: 1,
 
             config,
@@ -55,14 +55,14 @@ impl MirrorApp {
 impl eframe::App for MirrorApp {
     fn update(&mut self, ctx: &egui::Context, frame: &mut eframe::Frame) {
         self.frame_history
-            .on_new_frame(ctx.input().time, frame.info().cpu_usage);
+            .on_new_frame(ctx.input(|i| i.time), frame.info().cpu_usage);
 
         #[cfg(not(target_arch = "wasm32"))] // no File->Quit on web pages!
         egui::TopBottomPanel::top("top_panel").show(ctx, |ui| {
             egui::menu::bar(ui, |ui| {
                 ui.menu_button("File", |ui| {
                     if ui.button("Quit").clicked() {
-                        frame.close();
+                        ui.ctx().send_viewport_cmd(egui::ViewportCommand::Close);
                     }
                 });
                 ui.menu_button("Windows", |ui| {
@@ -84,12 +84,12 @@ impl eframe::App for MirrorApp {
 
             let mut added_nodes = Vec::new();
             DockArea::new(&mut self.tree)
-                .style(
-                    StyleBuilder::from_egui(ctx.style().as_ref())
-                        .show_add_buttons(true)
-                        .expand_tabs(true)
-                        .build(),
-                )
+                .show_add_buttons(true)
+                .style({
+                    let mut style = Style::from_egui(ctx.style().as_ref());
+                    style.tab_bar.fill_tab_bar = true;
+                    style
+                })
                 .show(
                     ctx,
                     &mut TabViewer {
@@ -98,8 +98,8 @@ impl eframe::App for MirrorApp {
                     },
                 );
 
-            added_nodes.drain(..).for_each(|node| {
-                self.tree.set_focused_node(node);
+            added_nodes.drain(..).for_each(|(surface, node)| {
+                self.tree.set_focused_node_and_surface((surface, node));
                 self.tree
                     .push_to_focused_leaf(CaptureTab::new(self.tree_len, &self.config));
                 self.tree_len += 1;

mirror/src/app.rs

@@ -81,6 +81,8 @@ impl FrameHistory {
             rounding: style.rounding,
             fill: ui.visuals().extreme_bg_color,
             stroke: ui.style().noninteractive().bg_stroke,
+            fill_texture_id: TextureId::default(), // ?
+            uv: Rect::from_min_max(pos2(0.0, 0.0), pos2(1.0, 1.0)),
         }));
 
         let rect = rect.shrink(4.0);
@@ -96,7 +98,7 @@ impl FrameHistory {
             let cpu_usage = to_screen.inverse().transform_pos(pointer_pos).y;
             let text = format!("{:.1} ms", 1e3 * cpu_usage);
             shapes.push(Shape::text(
-                &ui.fonts(),
+                &ui.fonts(|fonts| fonts.clone()),
                 pos2(rect.left(), y),
                 egui::Align2::LEFT_BOTTOM,
                 text,
@@ -107,7 +109,7 @@ impl FrameHistory {
 
         let circle_color = color;
         let radius = 2.0;
-        let right_side_time = ui.input().time; // Time at right side of screen
+        let right_side_time = ui.input(|i| i.time); // Time at right side of screen
 
         for (time, cpu_usage) in history.iter() {
             let age = (right_side_time - time) as f32;

mirror/src/app/frame_history.rs

@@ -1,7 +1,8 @@
 use ::std::io::Cursor;
 
-use ::egui::pos2;
+use ::egui_dock::egui::{self, pos2};
 use ::egui_dock::NodeIndex;
+use ::egui_dock::SurfaceIndex;
 use ::epaint::{Color32, Rect, TextureHandle};
 
 use ::memflow::prelude::v1::*;
@@ -12,7 +13,7 @@ use crate::{
 };
 
 pub struct TabViewer<'a> {
-    pub(crate) added_nodes: &'a mut Vec<NodeIndex>,
+    pub(crate) added_nodes: &'a mut Vec<(SurfaceIndex, NodeIndex)>,
     pub(crate) config: &'a mut MirrorConfig,
 }
 
@@ -42,8 +43,8 @@ impl egui_dock::TabViewer for TabViewer<'_> {
         }
     }
 
-    fn on_add(&mut self, node: NodeIndex) {
-        self.added_nodes.push(node);
+    fn on_add(&mut self, surface: SurfaceIndex, node: NodeIndex) {
+        self.added_nodes.push((surface, node));
     }
 }
 
@@ -230,10 +231,10 @@ impl CaptureTab {
                 let desired_width = desired_height * aspect_ratio;
 
                 let render_position = ui
-                    .add(egui::Image::new(
+                    .add(egui::Image::new(egui::load::SizedTexture::new(
                         frame_texture.id(),
                         [desired_width, desired_height],
-                    ))
+                    )))
                     .rect;
 
                 // render cursor on top of frame

mirror/src/app/tab_viewer.rs

@@ -2,15 +2,15 @@ use ::frame_counter::FrameCounter;
 use ::log::{info, warn};
 use ::mirror_dto::{CaptureConfig, Cursor, GlobalBufferHost};
 use ::parking_lot::RwLock;
+use ::pelite::pattern;
+use ::pelite::pattern::Atom;
 use ::std::{
     convert::TryInto,
     sync::atomic::{AtomicBool, Ordering},
     sync::Arc,
     thread,
     thread::JoinHandle,
 };
-use pelite::pattern;
-use pelite::pattern::Atom;
 
 use ::memflow::prelude::v1::*;
 
@@ -120,7 +120,7 @@ impl Capture for SequentialCapture {
             )
         };
 
-        egui::ImageData::Color(egui::ColorImage { size, pixels })
+        egui::ImageData::Color(Arc::new(egui::ColorImage { size, pixels }))
     }
 
     fn cursor_data(&self) -> Cursor {
@@ -214,7 +214,7 @@ impl Capture for ThreadedCapture {
             )
         };
 
-        egui::ImageData::Color(egui::ColorImage { size, pixels })
+        egui::ImageData::Color(Arc::new(egui::ColorImage { size, pixels }))
     }
 
     fn cursor_data(&self) -> Cursor {

mirror/src/capture.rs

@@ -78,7 +78,8 @@ fn main() -> Result<()> {
         "memflow mirror",
         native_options,
         Box::new(|cc| Box::new(MirrorApp::new(cc))),
-    );
+    )
+    .expect("could not start gui");
 
     Ok(())
 }