added text edit history / undo (ctrl-z)

src/layout/id.rs

@@ -9,7 +9,7 @@ use std::{
 };
 
 use crate::{
-    layout::{FnTag, Ui, Widget, WidgetLike, WidgetTag},
+    layout::{Ui, WidgetLike},
     util::{Id, RefCounter},
 };
 
@@ -141,49 +141,6 @@ pub struct IdFnTag;
 pub trait WidgetIdFn<W>: FnOnce(&mut Ui) -> WidgetId<W> {}
 impl<W, F: FnOnce(&mut Ui) -> WidgetId<W>> WidgetIdFn<W> for F {}
 
-/// TODO: does this ever make sense to use? it allows for invalid ids
-pub trait Idable<Tag> {
-    type Widget: Widget;
-    fn set(self, ui: &mut Ui, id: &WidgetId<Self::Widget>);
-    fn id(self, id: &WidgetId<Self::Widget>) -> impl WidgetIdFn<Self::Widget>
-    where
-        Self: Sized,
-    {
-        let id = id.clone();
-        move |ui| {
-            self.set(ui, &id);
-            id
-        }
-    }
-    fn id_static(self, id: StaticWidgetId<Self::Widget>) -> impl WidgetIdFn<Self::Widget>
-    where
-        Self: Sized,
-    {
-        move |ui| {
-            let id = id.id(&ui.send);
-            self.set(ui, &id);
-            id
-        }
-    }
-}
-
-impl<W: Widget> Idable<WidgetTag> for W {
-    type Widget = W;
-
-    fn set(self, ui: &mut Ui, id: &WidgetId<Self::Widget>) {
-        ui.set(id, self);
-    }
-}
-
-impl<F: FnOnce(&mut Ui) -> W, W: Widget> Idable<FnTag> for F {
-    type Widget = W;
-
-    fn set(self, ui: &mut Ui, id: &WidgetId<Self::Widget>) {
-        let w = self(ui);
-        ui.set(id, w);
-    }
-}
-
 impl<W: 'static> WidgetLike<IdTag> for WidgetId<W> {
     type Widget = W;
     fn add(self, _: &mut Ui) -> WidgetId<W> {

src/layout/ui.rs

@@ -52,15 +52,11 @@ impl Ui {
     }
 
     pub fn push<W: Widget>(&mut self, w: W) -> WidgetId<W> {
-        let id = self.id();
+        let id = self.new_id();
         self.data.widgets.insert(id.id, w);
         id
     }
 
-    pub fn set<W: Widget>(&mut self, id: &WidgetId<W>, w: W) {
-        self.data.widgets.insert(id.id, w);
-    }
-
     pub fn set_root<Tag>(&mut self, w: impl WidgetLike<Tag>) {
         self.root = Some(w.add(self).any());
         self.full_redraw = true;
@@ -78,7 +74,7 @@ impl Ui {
         self.data.widgets.get_mut(id)
     }
 
-    pub fn id<W: Widget>(&mut self) -> WidgetId<W> {
+    fn new_id<W: Widget>(&mut self) -> WidgetId<W> {
         WidgetId::new(
             self.data.widgets.reserve(),
             TypeId::of::<W>(),
@@ -87,11 +83,6 @@ impl Ui {
         )
     }
 
-    pub fn id_static<W: Widget>(&mut self) -> StaticWidgetId<W> {
-        let id = self.id();
-        id.into_static()
-    }
-
     pub fn add_texture(&mut self, image: DynamicImage) -> TextureHandle {
         self.data.textures.add(image)
     }