Merge branch 'master' into feature/pane-grid-titlebar

1 files changed, 23 insertions, 4 deletions

diff --git a/web/src/widget/image.rs b/web/src/widget/image.rs
index 029ab352..a595c29a 100644
--- a/web/src/widget/image.rs
+++ b/web/src/widget/image.rs
@@ -22,6 +22,9 @@ pub struct Image {
     /// The image path
     pub handle: Handle,
 
+    /// The alt text of the image
+    pub alt: String,
+
     /// The width of the image
     pub width: Length,
 
@@ -36,6 +39,7 @@ impl Image {
     pub fn new<T: Into<Handle>>(handle: T) -> Self {
         Image {
             handle: handle.into(),
+            alt: Default::default(),
             width: Length::Shrink,
             height: Length::Shrink,
         }
@@ -56,6 +60,14 @@ impl Image {
         self.height = height;
         self
     }
+
+    /// Sets the alt text of the [`Image`].
+    ///
+    /// [`Image`]: struct.Image.html
+    pub fn alt(mut self, alt: impl Into<String>) -> Self {
+        self.alt = alt.into();
+        self
+    }
 }
 
 impl<Message> Widget<Message> for Image {
@@ -66,12 +78,19 @@ impl<Message> Widget<Message> for Image {
         _style_sheet: &mut Css<'b>,
     ) -> dodrio::Node<'b> {
         use dodrio::builder::*;
+        use dodrio::bumpalo::collections::String;
+
+        let src = String::from_str_in(
+            match self.handle.data.as_ref() {
+                Data::Path(path) => path.to_str().unwrap_or(""),
+            },
+            bump,
+        )
+        .into_bump_str();
 
-        let src = bumpalo::format!(in bump, "{}", match self.handle.data.as_ref() {
-            Data::Path(path) => path.to_str().unwrap_or("")
-        });
+        let alt = String::from_str_in(&self.alt, bump).into_bump_str();
 
-        let mut image = img(bump).attr("src", src.into_bump_str());
+        let mut image = img(bump).attr("src", src).attr("alt", alt);
 
         match self.width {
             Length::Shrink => {}