Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge 7a51c95dac into 0e575b2809

Browse source
This commit is contained in:
Danilo Leal 2025-08-27 00:39:16 +08:00 • committed by GitHub
commit b9ec1a8c3f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 45 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
crates/editor/src/element.rs
View file

@ -3017,9 +3017,10 @@ impl EditorElement {
}; };
let toggle = IconButton::new(("expand", ix), icon_name) let toggle = IconButton::new(("expand", ix), icon_name)
.icon_color(Color::Custom(cx.theme().colors().editor_line_number))
.selected_icon_color(Color::Custom(cx.theme().colors().editor_foreground)) .selected_icon_color(Color::Custom(cx.theme().colors().editor_foreground))
.icon_color(Color::Custom(cx.theme().colors().editor_line_number))
.icon_size(IconSize::Custom(rems(editor_font_size / window.rem_size()))) .icon_size(IconSize::Custom(rems(editor_font_size / window.rem_size())))
.shape(ui::IconButtonShape::Wide)
.width(width) .width(width)
.on_click(move |_, window, cx| { .on_click(move |_, window, cx| {
editor.update(cx, |editor, cx| { editor.update(cx, |editor, cx| {

41
crates/ui/src/components/button/icon_button.rs
View file

@ -31,9 +31,9 @@ impl IconButton {
pub fn new(id: impl Into<ElementId>, icon: IconName) -> Self { pub fn new(id: impl Into<ElementId>, icon: IconName) -> Self {
let mut this = Self { let mut this = Self {
base: ButtonLike::new(id), base: ButtonLike::new(id),
shape: IconButtonShape::Wide, shape: IconButtonShape::Square,
icon, icon,
icon_size: IconSize::default(), icon_size: IconSize::Small,
icon_color: Color::Default, icon_color: Color::Default,
selected_icon: None, selected_icon: None,
selected_icon_color: None, selected_icon_color: None,
@ -232,6 +232,43 @@ impl Component for IconButton {
example_group_with_title( example_group_with_title(
"Icon Button Styles", "Icon Button Styles",
vec![ vec![
// TODO: Remove/organize this later
single_example(
"SIZES",
h_flex()
.gap_0p5()
.child(
IconButton::new("tinted", IconName::Debug)
.icon_size(IconSize::Indicator)
.layer(ElevationIndex::Background)
.style(ButtonStyle::Tinted(TintColor::Accent)),
)
.child(
IconButton::new("tinted", IconName::Debug)
.icon_size(IconSize::XSmall)
.layer(ElevationIndex::Background)
.style(ButtonStyle::Tinted(TintColor::Accent)),
)
.child(
IconButton::new("tinted", IconName::Debug)
.icon_size(IconSize::Small)
.layer(ElevationIndex::Background)
.style(ButtonStyle::Tinted(TintColor::Accent)),
)
.child(
IconButton::new("tinted", IconName::Debug)
.icon_size(IconSize::Medium)
.layer(ElevationIndex::Background)
.style(ButtonStyle::Tinted(TintColor::Accent)),
)
.child(
IconButton::new("tinted", IconName::Debug)
.icon_size(IconSize::XLarge)
.layer(ElevationIndex::Background)
.style(ButtonStyle::Tinted(TintColor::Accent)),
)
.into_any_element(),
),
single_example( single_example(
"Default", "Default",
IconButton::new("default", IconName::Check) IconButton::new("default", IconName::Check)

5
crates/ui/src/components/icon.rs
View file

@ -84,11 +84,12 @@ impl IconSize {
/// 2. The padding of one side of the square /// 2. The padding of one side of the square
pub fn square_components(&self, window: &mut Window, cx: &mut App) -> (Pixels, Pixels) { pub fn square_components(&self, window: &mut Window, cx: &mut App) -> (Pixels, Pixels) {
let icon_size = self.rems() * window.rem_size(); let icon_size = self.rems() * window.rem_size();
let padding = match self { let padding = match self {
IconSize::Indicator => DynamicSpacing::Base00.px(cx), IconSize::Indicator => DynamicSpacing::Base00.px(cx),
IconSize::XSmall => DynamicSpacing::Base02.px(cx), IconSize::XSmall => DynamicSpacing::Base02.px(cx),
IconSize::Small => DynamicSpacing::Base02.px(cx), IconSize::Small => DynamicSpacing::Base04.px(cx),
IconSize::Medium => DynamicSpacing::Base02.px(cx), IconSize::Medium => DynamicSpacing::Base06.px(cx),
IconSize::XLarge => DynamicSpacing::Base02.px(cx), IconSize::XLarge => DynamicSpacing::Base02.px(cx),
// TODO: Wire into dynamic spacing // TODO: Wire into dynamic spacing
IconSize::Custom(size) => size.to_pixels(window.rem_size()), IconSize::Custom(size) => size.to_pixels(window.rem_size()),

2
crates/workspace/src/pane.rs
View file

@ -2622,7 +2622,7 @@ impl Pane {
.shape(IconButtonShape::Square) .shape(IconButtonShape::Square)
.icon_color(Color::Muted) .icon_color(Color::Muted)
.size(ButtonSize::None) .size(ButtonSize::None)
.icon_size(IconSize::Small) .icon_size(IconSize::XSmall)
.on_click(cx.listener(move |pane, _, window, cx| { .on_click(cx.listener(move |pane, _, window, cx| {
pane.close_item_by_id(item_id, SaveIntent::Close, window, cx) pane.close_item_by_id(item_id, SaveIntent::Close, window, cx)
.detach_and_log_err(cx); .detach_and_log_err(cx);