forked from reya/gpui-native-kit
feat: support app-defined icon sets
This commit is contained in:
+15
-12
@@ -10,7 +10,7 @@ use gpui_native_core::button::{Button, ButtonVariant};
|
||||
use gpui_native_core::common::Sizable as _;
|
||||
use gpui_native_core::spinner::Spinner;
|
||||
use gpui_native_core::tooltip::Tooltip;
|
||||
use gpui_native_icons::{IconRole, icon};
|
||||
use gpui_native_icons::{Icon, IconRole};
|
||||
use gpui_native_theme::{ActiveTheme as _, Size};
|
||||
use gpui_native_utils::adjacent_selectable;
|
||||
|
||||
@@ -35,7 +35,7 @@ pub struct Tab {
|
||||
/// The stable identity for element state; must survive reordering.
|
||||
key: ElementId,
|
||||
label: SharedString,
|
||||
icon: Option<IconRole>,
|
||||
icon: Option<Icon>,
|
||||
lead: Option<AnyElement>,
|
||||
busy: bool,
|
||||
disabled: bool,
|
||||
@@ -63,8 +63,11 @@ impl Tab {
|
||||
}
|
||||
|
||||
/// Shows an icon leading the label.
|
||||
pub fn icon(mut self, role: IconRole) -> Self {
|
||||
self.icon = Some(role);
|
||||
pub fn icon<I>(mut self, icon: I) -> Self
|
||||
where
|
||||
I: Into<Icon>,
|
||||
{
|
||||
self.icon = Some(icon.into());
|
||||
self
|
||||
}
|
||||
|
||||
@@ -344,18 +347,18 @@ fn render_tab(
|
||||
};
|
||||
|
||||
let lead = tab.lead.take();
|
||||
let icon = tab.icon.take();
|
||||
|
||||
strip_tab = match lead {
|
||||
Some(lead) => strip_tab.child(lead),
|
||||
None => match variant {
|
||||
TabsVariant::Underline => strip_tab.child(div().flex_none().pb_0p5().when_some(
|
||||
tab.icon,
|
||||
|slot, role| {
|
||||
slot.child(icon(role).size(metrics.dense_icon_size).color(label_color))
|
||||
},
|
||||
)),
|
||||
TabsVariant::Pill => strip_tab.when_some(tab.icon, |strip_tab, role| {
|
||||
strip_tab.child(icon(role).size(metrics.dense_icon_size).color(label_color))
|
||||
TabsVariant::Underline => {
|
||||
strip_tab.child(div().flex_none().pb_0p5().when_some(icon, |slot, icon| {
|
||||
slot.child(icon.size(metrics.dense_icon_size).color(label_color))
|
||||
}))
|
||||
}
|
||||
TabsVariant::Pill => strip_tab.when_some(icon, |strip_tab, icon| {
|
||||
strip_tab.child(icon.size(metrics.dense_icon_size).color(label_color))
|
||||
}),
|
||||
},
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user