RE ADD CONTEXT

src/widget/text/mod.rs

@@ -11,22 +11,22 @@ use std::ops::{Deref, DerefMut};
 
 pub const SHAPING: Shaping = Shaping::Advanced;
 
-pub struct Text {
+pub struct Text<State> {
     pub content: MutDetect<String>,
-    view: TextView,
+    view: TextView<State>,
 }
 
-pub struct TextView {
+pub struct TextView<State> {
     pub attrs: MutDetect<TextAttrs>,
     pub buf: MutDetect<TextBuffer>,
     // cache
     tex: Option<RenderedText>,
     width: Option<f32>,
-    pub hint: Option<WidgetHandle>,
+    pub hint: Option<WidgetHandle<State>>,
 }
 
-impl TextView {
-    pub fn new(buf: TextBuffer, attrs: TextAttrs, hint: Option<WidgetHandle>) -> Self {
+impl<State: 'static> TextView<State> {
+    pub fn new(buf: TextBuffer, attrs: TextAttrs, hint: Option<WidgetHandle<State>>) -> Self {
         Self {
             attrs: attrs.into(),
             buf: buf.into(),
@@ -54,7 +54,7 @@ impl TextView {
         region
     }
 
-    fn render(&mut self, ctx: &mut SizeCtx) -> RenderedText {
+    fn render(&mut self, ctx: &mut SizeCtx<State>) -> RenderedText {
         let width = if self.attrs.wrap {
             Some(ctx.px_size().x)
         } else {
@@ -80,7 +80,7 @@ impl TextView {
     pub fn tex(&self) -> Option<&RenderedText> {
         self.tex.as_ref()
     }
-    pub fn desired_width(&mut self, ctx: &mut SizeCtx) -> Len {
+    pub fn desired_width(&mut self, ctx: &mut SizeCtx<State>) -> Len {
         if let Some(hint) = &self.hint
             && let [line] = &self.buf.lines[..]
             && line.text().is_empty()
@@ -90,7 +90,7 @@ impl TextView {
             Len::abs(self.render(ctx).size.x)
         }
     }
-    pub fn desired_height(&mut self, ctx: &mut SizeCtx) -> Len {
+    pub fn desired_height(&mut self, ctx: &mut SizeCtx<State>) -> Len {
         if let Some(hint) = &self.hint
             && let [line] = &self.buf.lines[..]
             && line.text().is_empty()
@@ -100,7 +100,7 @@ impl TextView {
             Len::abs(self.render(ctx).size.y)
         }
     }
-    pub fn draw(&mut self, painter: &mut Painter) -> UiRegion {
+    pub fn draw(&mut self, painter: &mut Painter<State>) -> UiRegion {
         let tex = self.render(&mut painter.size_ctx());
         let region = self.tex_region(&tex);
         if let Some(hint) = &self.hint
@@ -124,7 +124,7 @@ impl TextView {
     }
 }
 
-impl Text {
+impl<State: 'static> Text<State> {
     pub fn new(content: impl Into<String>) -> Self {
         let attrs = TextAttrs::default();
         let buf = TextBuffer::new_empty(Metrics::new(attrs.font_size, attrs.line_height));
@@ -133,7 +133,7 @@ impl Text {
             view: TextView::new(buf, attrs, None),
         }
     }
-    fn update_buf(&mut self, ctx: &mut SizeCtx) {
+    fn update_buf(&mut self, ctx: &mut SizeCtx<State>) {
         if self.content.changed {
             self.content.changed = false;
             self.view.buf.set_text(
@@ -147,18 +147,18 @@ impl Text {
     }
 }
 
-impl Widget for Text {
-    fn draw(&mut self, painter: &mut Painter) {
+impl<State: 'static> Widget<State> for Text<State> {
+    fn draw(&mut self, painter: &mut Painter<State>) {
         self.update_buf(&mut painter.size_ctx());
         self.view.draw(painter);
     }
 
-    fn desired_width(&mut self, ctx: &mut SizeCtx) -> Len {
+    fn desired_width(&mut self, ctx: &mut SizeCtx<State>) -> Len {
         self.update_buf(ctx);
         self.view.desired_width(ctx)
     }
 
-    fn desired_height(&mut self, ctx: &mut SizeCtx) -> Len {
+    fn desired_height(&mut self, ctx: &mut SizeCtx<State>) -> Len {
         self.update_buf(ctx);
         self.view.desired_height(ctx)
     }
@@ -174,7 +174,7 @@ pub fn edit_line(line: &mut BufferLine, text: String) {
     line.set_text(text, line.ending(), line.attrs_list().clone());
 }
 
-impl Deref for Text {
+impl<State> Deref for Text<State> {
     type Target = TextAttrs;
 
     fn deref(&self) -> &Self::Target {
@@ -182,13 +182,13 @@ impl Deref for Text {
     }
 }
 
-impl DerefMut for Text {
+impl<State> DerefMut for Text<State> {
     fn deref_mut(&mut self) -> &mut Self::Target {
         &mut self.view
     }
 }
 
-impl Deref for TextView {
+impl<State> Deref for TextView<State> {
     type Target = TextAttrs;
 
     fn deref(&self) -> &Self::Target {
@@ -196,7 +196,7 @@ impl Deref for TextView {
     }
 }
 
-impl DerefMut for TextView {
+impl<State> DerefMut for TextView<State> {
     fn deref_mut(&mut self) -> &mut Self::Target {
         &mut self.attrs
     }