refactor(widget): improvements to button and icon widgets

src/widget/button/link.rs

@@ -0,0 +1,101 @@
+// Copyright 2023 System76 <info@system76.com>
+// SPDX-License-Identifier: MPL-2.0
+
+use super::Builder;
+use super::Style;
+use crate::prelude::*;
+use crate::widget::icon::{self, Handle};
+use crate::widget::{button, row, tooltip};
+use crate::Element;
+use iced_core::text::LineHeight;
+use iced_core::{font::Weight, widget::Id, Alignment, Length, Padding};
+use std::borrow::Cow;
+
+pub type Button<'a, Message> = Builder<'a, Message, Hyperlink>;
+
+pub struct Hyperlink {
+    trailing_icon: bool,
+}
+
+pub fn link<'a, Message>(label: impl Into<Cow<'a, str>> + 'static) -> Button<'a, Message> {
+    Button::new(
+        label,
+        Hyperlink {
+            trailing_icon: false,
+        },
+    )
+}
+
+impl<'a, Message> Button<'a, Message> {
+    pub fn new(label: impl Into<Cow<'a, str>> + 'static, link: Hyperlink) -> Self {
+        Self {
+            id: Id::unique(),
+            label: label.into(),
+            tooltip: Cow::Borrowed(""),
+            on_press: None,
+            width: Length::Shrink,
+            height: Length::Shrink,
+            padding: Padding::from(4),
+            spacing: 0,
+            icon_size: 16,
+            line_height: 20,
+            font_size: 14,
+            font_weight: Weight::Normal,
+            style: Style::Link,
+            variant: link,
+        }
+    }
+
+    pub const fn trailing_icon(mut self, set: bool) -> Self {
+        self.variant.trailing_icon = set;
+        self
+    }
+}
+
+pub fn icon() -> Handle {
+    icon::from_svg_bytes(&include_bytes!("external-link.svg")[..]).symbolic(true)
+}
+
+impl<'a, Message: Clone + 'static> From<Button<'a, Message>> for Element<'a, Message> {
+    fn from(mut builder: Button<'a, Message>) -> Element<'a, Message> {
+        let button: super::Button<'a, Message, crate::Renderer> = row::with_capacity(2)
+            .push({
+                let mut font = crate::font::DEFAULT;
+                font.weight = builder.font_weight;
+
+                // TODO: Avoid allocation
+                crate::widget::text(builder.label.to_string())
+                    .size(builder.font_size)
+                    .line_height(LineHeight::Absolute(builder.line_height.into()))
+                    .font(font)
+            })
+            .push_maybe(if builder.variant.trailing_icon {
+                Some(icon().icon().size(builder.icon_size))
+            } else {
+                None
+            })
+            .padding(builder.padding)
+            .width(builder.width)
+            .height(builder.height)
+            .spacing(builder.spacing)
+            .align_items(Alignment::Center)
+            .apply(button)
+            .padding(0)
+            .id(builder.id)
+            .on_press_maybe(builder.on_press.take())
+            .style(builder.style);
+
+        if builder.tooltip.is_empty() {
+            button.into()
+        } else {
+            tooltip(button, builder.tooltip, tooltip::Position::Top)
+                .size(builder.font_size)
+                .font({
+                    let mut font = crate::font::DEFAULT;
+                    font.weight = builder.font_weight;
+                    font
+                })
+                .into()
+        }
+    }
+}