mirror of
https://github.com/zed-industries/zed.git
synced 2025-02-11 21:00:35 +00:00
Update icon positioning in tabs (#14804)
Some checks are pending
CI / Check formatting and spelling (push) Waiting to run
CI / (macOS) Run Clippy and tests (push) Waiting to run
CI / (Linux) Run Clippy and tests (push) Waiting to run
CI / (Windows) Run Clippy and tests (push) Waiting to run
CI / Create a macOS bundle (push) Blocked by required conditions
CI / Create a Linux bundle (push) Blocked by required conditions
CI / Create arm64 Linux bundle (push) Blocked by required conditions
Deploy Docs / Deploy Docs (push) Waiting to run
Some checks are pending
CI / Check formatting and spelling (push) Waiting to run
CI / (macOS) Run Clippy and tests (push) Waiting to run
CI / (Linux) Run Clippy and tests (push) Waiting to run
CI / (Windows) Run Clippy and tests (push) Waiting to run
CI / Create a macOS bundle (push) Blocked by required conditions
CI / Create a Linux bundle (push) Blocked by required conditions
CI / Create arm64 Linux bundle (push) Blocked by required conditions
Deploy Docs / Deploy Docs (push) Waiting to run
This PR updates the icon positioning in tabs to make give them even spacing on either side. Without file icons: <img width="901" alt="Screenshot 2024-07-19 at 7 55 39 AM" src="https://github.com/user-attachments/assets/89cc80cd-1323-424e-90a5-79d8586e8725"> With file icons: <img width="956" alt="Screenshot 2024-07-19 at 7 55 52 AM" src="https://github.com/user-attachments/assets/c5b47b4e-e6c3-4dbd-aeb3-fb09a0032105"> Release Notes: - N/A
This commit is contained in:
parent
18c2e8f6ca
commit
836f623800
1 changed files with 13 additions and 11 deletions
|
@ -1665,16 +1665,7 @@ impl Pane {
|
|||
.when_some(item.tab_tooltip_text(cx), |tab, text| {
|
||||
tab.tooltip(move |cx| Tooltip::text(text.clone(), cx))
|
||||
})
|
||||
.map(|tab| match indicator {
|
||||
Some(indicator) => tab.start_slot(indicator),
|
||||
None => tab.start_slot::<Icon>(icon.map(|icon| {
|
||||
icon.size(IconSize::XSmall).color(if is_active {
|
||||
Color::Default
|
||||
} else {
|
||||
Color::Muted
|
||||
})
|
||||
})),
|
||||
})
|
||||
.start_slot::<Indicator>(indicator)
|
||||
.end_slot(
|
||||
IconButton::new("close tab", IconName::Close)
|
||||
.shape(IconButtonShape::Square)
|
||||
|
@ -1686,7 +1677,18 @@ impl Pane {
|
|||
.detach_and_log_err(cx);
|
||||
})),
|
||||
)
|
||||
.child(label);
|
||||
.child(
|
||||
h_flex()
|
||||
.gap_1()
|
||||
.children(icon.map(|icon| {
|
||||
icon.size(IconSize::Small).color(if is_active {
|
||||
Color::Default
|
||||
} else {
|
||||
Color::Muted
|
||||
})
|
||||
}))
|
||||
.child(label),
|
||||
);
|
||||
|
||||
let single_entry_to_resolve = {
|
||||
let item_entries = self.items[ix].project_entry_ids(cx);
|
||||
|
|
Loading…
Reference in a new issue