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

Stop caching needlessly (#35308)

Browse source 
Release Notes:

- N/A
This commit is contained in:
Mikayla Maki 2025-07-29 16:38:06 -07:00 • committed by GitHub
parent b8f3a9101c
commit 17a0179f0a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 2 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

11
crates/workspace/src/workspace.rs
View file

@ -1065,7 +1065,6 @@ pub struct Workspace {
center: PaneGroup, center: PaneGroup,
left_dock: Entity<Dock>, left_dock: Entity<Dock>,
bottom_dock: Entity<Dock>, bottom_dock: Entity<Dock>,
bottom_dock_layout: BottomDockLayout,
right_dock: Entity<Dock>, right_dock: Entity<Dock>,
panes: Vec<Entity<Pane>>, panes: Vec<Entity<Pane>>,
panes_by_item: HashMap<EntityId, WeakEntity<Pane>>, panes_by_item: HashMap<EntityId, WeakEntity<Pane>>,
@ -1307,7 +1306,6 @@ impl Workspace {
) )
.detach(); .detach();
let bottom_dock_layout = WorkspaceSettings::get_global(cx).bottom_dock_layout;
let left_dock = Dock::new(DockPosition::Left, modal_layer.clone(), window, cx); let left_dock = Dock::new(DockPosition::Left, modal_layer.clone(), window, cx);
let bottom_dock = Dock::new(DockPosition::Bottom, modal_layer.clone(), window, cx); let bottom_dock = Dock::new(DockPosition::Bottom, modal_layer.clone(), window, cx);
let right_dock = Dock::new(DockPosition::Right, modal_layer.clone(), window, cx); let right_dock = Dock::new(DockPosition::Right, modal_layer.clone(), window, cx);
@ -1406,7 +1404,6 @@ impl Workspace {
suppressed_notifications: HashSet::default(), suppressed_notifications: HashSet::default(),
left_dock, left_dock,
bottom_dock, bottom_dock,
bottom_dock_layout,
right_dock, right_dock,
project: project.clone(), project: project.clone(),
follower_states: Default::default(), follower_states: Default::default(),
@ -1633,10 +1630,6 @@ impl Workspace {
&self.bottom_dock &self.bottom_dock
} }
pub fn bottom_dock_layout(&self) -> BottomDockLayout {
self.bottom_dock_layout
}
pub fn set_bottom_dock_layout( pub fn set_bottom_dock_layout(
&mut self, &mut self,
layout: BottomDockLayout, layout: BottomDockLayout,
@ -1648,7 +1641,6 @@ impl Workspace {
content.bottom_dock_layout = Some(layout); content.bottom_dock_layout = Some(layout);
}); });
self.bottom_dock_layout = layout;
cx.notify(); cx.notify();
self.serialize_workspace(window, cx); self.serialize_workspace(window, cx);
} }
@ -6246,6 +6238,7 @@ impl Render for Workspace {
.iter() .iter()
.map(|(_, notification)| notification.entity_id()) .map(|(_, notification)| notification.entity_id())
.collect::<Vec<_>>(); .collect::<Vec<_>>();
let bottom_dock_layout = WorkspaceSettings::get_global(cx).bottom_dock_layout;
client_side_decorations( client_side_decorations(
self.actions(div(), window, cx) self.actions(div(), window, cx)
@ -6369,7 +6362,7 @@ impl Render for Workspace {
)) ))
}) })
.child({ .child({
match self.bottom_dock_layout { match bottom_dock_layout {
BottomDockLayout::Full => div() BottomDockLayout::Full => div()
.flex() .flex()
.flex_col() .flex_col()