Upgrade Iced and render Markdown tables

src/native_edit.rs

@@ -6,7 +6,6 @@ use iced::advanced::overlay;
 use iced::advanced::renderer;
 use iced::advanced::widget::{Operation, Tree, tree};
 use iced::advanced::{Clipboard, Layout, Shell, Widget};
-use iced::event;
 use iced::keyboard::{self, Key, Location, Modifiers, key};
 use iced::mouse;
 use iced::{Element, Event, Length, Rectangle, Size, Vector};
@@ -95,9 +94,12 @@ fn command_events(command: EditCommand) -> [Event; 4] {
             location: Location::Standard,
             modifiers,
             text: None,
+            repeat: false,
         }),
         Event::Keyboard(keyboard::Event::KeyReleased {
             key,
+            modified_key: Key::Character(modified_character.into()),
+            physical_key: key::Physical::Code(physical_key),
             location: Location::Standard,
             modifiers,
         }),
@@ -131,67 +133,63 @@ where
     }
 
     fn layout(
-        &self,
+        &mut self,
         tree: &mut Tree,
         renderer: &Renderer,
         limits: &layout::Limits,
     ) -> layout::Node {
         self.content
-            .as_widget()
+            .as_widget_mut()
             .layout(&mut tree.children[0], renderer, limits)
     }
 
     fn operate(
-        &self,
+        &mut self,
         tree: &mut Tree,
         layout: Layout<'_>,
         renderer: &Renderer,
         operation: &mut dyn Operation,
     ) {
         self.content
-            .as_widget()
+            .as_widget_mut()
             .operate(&mut tree.children[0], layout, renderer, operation);
     }
 
-    fn on_event(
+    fn update(
         &mut self,
         tree: &mut Tree,
-        event: Event,
+        event: &Event,
         layout: Layout<'_>,
         cursor: mouse::Cursor,
         renderer: &Renderer,
         clipboard: &mut dyn Clipboard,
         shell: &mut Shell<'_, Message>,
         viewport: &Rectangle,
-    ) -> event::Status {
-        let mut status = event::Status::Ignored;
+    ) {
         if matches!(
             event,
             Event::Window(iced::window::Event::RedrawRequested(_))
         ) {
             while let Some(command) = pop_command(&self.commands) {
                 for command_event in command_events(command) {
-                    if self.content.as_widget_mut().on_event(
+                    self.content.as_widget_mut().update(
                         &mut tree.children[0],
-                        command_event,
+                        &command_event,
                         layout,
                         cursor,
                         renderer,
                         clipboard,
                         shell,
                         viewport,
-                    ) == event::Status::Captured
-                    {
-                        status = event::Status::Captured;
-                    }
+                    );
                 }
             }
         }
 
-        if let Some(sync_event) = modifier_sync_event(&event) {
-            let _ = self.content.as_widget_mut().on_event(
+        if let Some(sync_event) = modifier_sync_event(event) {
+            self.content.as_widget_mut().update(
                 &mut tree.children[0],
-                sync_event,
+                &sync_event,
                 layout,
                 cursor,
                 renderer,
@@ -201,7 +199,7 @@ where
             );
         }
 
-        if self.content.as_widget_mut().on_event(
+        self.content.as_widget_mut().update(
             &mut tree.children[0],
             event,
             layout,
@@ -210,12 +208,7 @@ where
             clipboard,
             shell,
             viewport,
-        ) == event::Status::Captured
-        {
-            event::Status::Captured
-        } else {
-            status
-        }
+        );
     }
 
     fn mouse_interaction(
@@ -259,13 +252,18 @@ where
     fn overlay<'b>(
         &'b mut self,
         tree: &'b mut Tree,
-        layout: Layout<'_>,
+        layout: Layout<'b>,
         renderer: &Renderer,
+        viewport: &Rectangle,
         translation: Vector,
     ) -> Option<overlay::Element<'b, Message, Theme, Renderer>> {
-        self.content
-            .as_widget_mut()
-            .overlay(&mut tree.children[0], layout, renderer, translation)
+        self.content.as_widget_mut().overlay(
+            &mut tree.children[0],
+            layout,
+            renderer,
+            viewport,
+            translation,
+        )
     }
 }