pane: Fix double or invisible borders in tab bar (#29061)
Invisible borders: <img width="349" alt="Screenshot 2025-04-18 at 3 59 03 PM" src="https://github.com/user-attachments/assets/a3a43885-ce87-4fcf-864a-d730fea1551e" /> <img width="547" alt="Screenshot 2025-04-18 at 8 23 15 PM" src="https://github.com/user-attachments/assets/1f8669a8-f893-4c58-ba30-025be1bc733f" /> Double borders: <img width="295" alt="Screenshot 2025-04-18 at 3 56 48 PM" src="https://github.com/user-attachments/assets/7b4ae42d-c7fd-478c-97ce-10abefe4a482" /> Release Notes: - N/A
This commit is contained in:
parent
1e0ae35f69
commit
3932a6c51e
2 changed files with 15 additions and 9 deletions
|
@ -122,9 +122,15 @@ impl RenderOnce for Tab {
|
||||||
};
|
};
|
||||||
|
|
||||||
let (start_slot, end_slot) = {
|
let (start_slot, end_slot) = {
|
||||||
let start_slot = h_flex().size_3().justify_center().children(self.start_slot);
|
let start_slot = h_flex()
|
||||||
|
.size(px(12.)) // use px over rem from size_3
|
||||||
|
.justify_center()
|
||||||
|
.children(self.start_slot);
|
||||||
|
|
||||||
let end_slot = h_flex().size_3().justify_center().children(self.end_slot);
|
let end_slot = h_flex()
|
||||||
|
.size(px(12.)) // use px over rem from size_3
|
||||||
|
.justify_center()
|
||||||
|
.children(self.end_slot);
|
||||||
|
|
||||||
match self.close_side {
|
match self.close_side {
|
||||||
TabCloseSide::End => (start_slot, end_slot),
|
TabCloseSide::End => (start_slot, end_slot),
|
||||||
|
@ -148,7 +154,7 @@ impl RenderOnce for Tab {
|
||||||
if self.selected {
|
if self.selected {
|
||||||
this.border_l_1().border_r_1().pb_px()
|
this.border_l_1().border_r_1().pb_px()
|
||||||
} else {
|
} else {
|
||||||
this.pr_px().pl_px().border_b_1().border_r_1()
|
this.pr_px().border_b_1().border_r_1()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
TabPosition::Middle(Ordering::Equal) => this.border_l_1().border_r_1().pb_px(),
|
TabPosition::Middle(Ordering::Equal) => this.border_l_1().border_r_1().pb_px(),
|
||||||
|
|
|
@ -2661,12 +2661,12 @@ impl Pane {
|
||||||
tab_bar
|
tab_bar
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
.children(pinned_tabs.len().ne(&0).then(|| {
|
.children(
|
||||||
h_flex()
|
pinned_tabs
|
||||||
.children(pinned_tabs)
|
.len()
|
||||||
.border_r_2()
|
.ne(&0)
|
||||||
.border_color(cx.theme().colors().border)
|
.then(|| h_flex().children(pinned_tabs)),
|
||||||
}))
|
)
|
||||||
.child(
|
.child(
|
||||||
h_flex()
|
h_flex()
|
||||||
.id("unpinned tabs")
|
.id("unpinned tabs")
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue