Partial update for 0.21

Cargo.toml

@@ -17,10 +17,10 @@ default = []
 serde = ["dep:serde", "egui/persistence"]
 
 [dependencies]
-egui = "0.20"
+egui = "0.21"
 
 [dev-dependencies]
-eframe = "0.20"
+eframe = "0.21"
 
 [dependencies.serde]
 version = "1"

examples/simple/frame_history.rs

@@ -78,27 +78,9 @@ impl FrameHistory {
         let color = ui.visuals().text_color();
         let line_stroke = Stroke::new(1.0, color);
 
-        if let Some(pointer_pos) = response.hover_pos() {
-            let y = pointer_pos.y;
-            shapes.push(Shape::line_segment(
-                [pos2(rect.left(), y), pos2(rect.right(), y)],
-                line_stroke,
-            ));
-            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(),
-                pos2(rect.left(), y),
-                egui::Align2::LEFT_BOTTOM,
-                text,
-                TextStyle::Monospace.resolve(ui.style()),
-                color,
-            ));
-        }
-
         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;

examples/simple/main.rs

@@ -7,7 +7,7 @@ mod frame_history;
 
 pub fn main() {
     let app = App::default();
-    eframe::run_native(
+    let _ = eframe::run_native(
         "Mem-Edit Example",
         NativeOptions::default(),
         Box::new(|_cc| Box::new(app)),
@@ -83,7 +83,7 @@ impl Memory {
 }
 
 fn create_frame_history(ctx: &Context, frame: &Frame, frame_history: &mut FrameHistory) {
-    frame_history.on_new_frame(ctx.input().time, frame.info().cpu_usage);
+    frame_history.on_new_frame(ctx.input(|i| i.time), frame.info().cpu_usage);
     egui::SidePanel::left("SidePanel").show(ctx, |ui| {
         frame_history.ui(ui);
     });

src/lib.rs

@@ -441,7 +441,7 @@ impl MemoryEditor {
             return;
         };
 
-        let key_pressed = KEYS.iter().find(|&&k| ctx.input().key_pressed(k));
+        let key_pressed = KEYS.iter().find(|&&k| ctx.input(|i| i.key_pressed(k)));
         if let Some(key) = key_pressed {
             let next_address = match key {
                 ArrowDown => current_address + self.options.column_count,

src/option_ui.rs

@@ -80,12 +80,12 @@ impl MemoryEditor {
 
             // For some reason egui is triggering response.clicked() when we press enter at the moment
             // (didn't used to do this). The additional check for not having enter pressed will need to stay until that is fixed.
-            if response.clicked() && !ui.input().key_pressed(egui::Key::Enter) {
+            if response.clicked() && !ui.input(|i| i.key_pressed(egui::Key::Enter)) {
                 self.frame_data.goto_address_string.clear();
             }
 
             // If we pressed enter, move to the address
-            if response.lost_focus() && ui.input().key_pressed(egui::Key::Enter) {
+            if response.lost_focus() && ui.input(|i| i.key_pressed(egui::Key::Enter)) {
                 let goto_address_string = &mut self.frame_data.goto_address_string;
 
                 if goto_address_string.starts_with("0x") || goto_address_string.starts_with("0X") {