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

Revert accidental merge of old version of workspace2 render function (#3694)

Browse source 
Something happened with my local diff and
https://github.com/zed-industries/zed/pull/3691 somehow contained an old
version of workspace2's render function. Perhaps I rebased at some point
and borked it? Not sure 🤷‍♀️

Release Notes:

- N/A
This commit is contained in:
Julia 2023-12-18 11:32:06 -05:00 • committed by GitHub
parent a623929340
commit 4707248714
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 58 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

89
crates/workspace2/src/workspace2.rs
View file

@ -3534,6 +3534,8 @@ impl Render for Workspace {
) )
}; };
let theme = cx.theme().clone();
let colors = theme.colors();
cx.set_rem_size(ui_font_size); cx.set_rem_size(ui_font_size);
self.actions(div(), cx) self.actions(div(), cx)
@ -3546,10 +3548,10 @@ impl Render for Workspace {
.gap_0() .gap_0()
.justify_start() .justify_start()
.items_start() .items_start()
.text_color(cx.theme().colors().text) .text_color(colors.text)
.bg(cx.theme().colors().background) .bg(colors.background)
.border() .border()
.border_color(cx.theme().colors().border) .border_color(colors.border)
.children(self.titlebar_item.clone()) .children(self.titlebar_item.clone())
.child( .child(
div() div()
@ -3562,7 +3564,7 @@ impl Render for Workspace {
.overflow_hidden() .overflow_hidden()
.border_t() .border_t()
.border_b() .border_b()
.border_color(cx.theme().colors().border) .border_color(colors.border)
.child( .child(
canvas(cx.listener(|workspace, bounds, _| { canvas(cx.listener(|workspace, bounds, _| {
workspace.bounds = *bounds; workspace.bounds = *bounds;
@ -3601,13 +3603,15 @@ impl Render for Workspace {
.flex_row() .flex_row()
.h_full() .h_full()
// Left Dock // Left Dock
.child( .children(self.zoomed_position.ne(&Some(DockPosition::Left)).then(
div() || {
.flex() div()
.flex_none() .flex()
.overflow_hidden() .flex_none()
.child(self.left_dock.clone()), .overflow_hidden()
) .child(self.left_dock.clone())
},
))
// Panes // Panes
.child( .child(
div() div()
@ -3615,29 +3619,52 @@ impl Render for Workspace {
.flex_col() .flex_col()
.flex_1() .flex_1()
.overflow_hidden() .overflow_hidden()
.child({ .child(self.center.render(
self.center.render( &self.project,
&self.project, &self.follower_states,
&self.follower_states, self.active_call(),
self.active_call(), &self.active_pane,
&self.active_pane, self.zoomed.as_ref(),
self.zoomed.as_ref(), &self.app_state,
&self.app_state, cx,
cx, ))
) .children(
}) self.zoomed_position
.child(self.bottom_dock.clone()), .ne(&Some(DockPosition::Bottom))
.then(|| self.bottom_dock.clone()),
),
) )
// Right Dock // Right Dock
.child( .children(self.zoomed_position.ne(&Some(DockPosition::Right)).then(
div() || {
.flex() div()
.flex_none() .flex()
.overflow_hidden() .flex_none()
.child(self.right_dock.clone()), .overflow_hidden()
), .child(self.right_dock.clone())
},
)),
) )
.children(self.render_notifications(cx)), .children(self.render_notifications(cx))
.children(self.zoomed.as_ref().and_then(|view| {
let zoomed_view = view.upgrade()?;
let div = div()
.z_index(1)
.absolute()
.overflow_hidden()
.border_color(colors.border)
.bg(colors.background)
.child(zoomed_view)
.inset_0()
.shadow_lg();
Some(match self.zoomed_position {
Some(DockPosition::Left) => div.right_2().border_r(),
Some(DockPosition::Right) => div.left_2().border_l(),
Some(DockPosition::Bottom) => div.top_2().border_t(),
None => div.top_2().bottom_2().left_2().right_2().border(),
})
})),
) )
.child(self.status_bar.clone()) .child(self.status_bar.clone())
} }