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

Merge branch 'main' into editor2-rendering

Browse source
This commit is contained in:
Conrad Irwin 2023-11-06 11:06:43 -07:00
commit c59817cd72
90 changed files with 4097 additions and 1476 deletions
Download patch file Download diff file Expand all files Collapse all files

6
crates/workspace2/src/pane.rs
View file

@ -1377,13 +1377,13 @@ impl Pane {
let (text_color, tab_bg, tab_hover_bg, tab_active_bg) = match ix == self.active_item_index {
false => (
cx.theme().colors().text_muted,
cx.theme().colors().tab_inactive,
cx.theme().colors().tab_inactive_background,
cx.theme().colors().ghost_element_hover,
cx.theme().colors().ghost_element_active,
),
true => (
cx.theme().colors().text,
cx.theme().colors().tab_active,
cx.theme().colors().tab_active_background,
cx.theme().colors().element_hover,
cx.theme().colors().element_active,
),
@ -1453,7 +1453,7 @@ impl Pane {
.id("tab_bar")
.w_full()
.flex()
.bg(cx.theme().colors().tab_bar)
.bg(cx.theme().colors().tab_bar_background)
// Left Side
.child(
div()