zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-09-20 02:47:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix fmt

Browse Source
This commit is contained in:
Mikayla Maki 2023-06-15 14:51:38 -07:00
parent 6662066821
commit b9cb594626
No known key found for this signature in database
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crates/workspace/src/persistence/model.rs
View File

@ -100,7 +100,7 @@ impl Bind for DockStructure {
pub struct DockData { pub struct DockData {
pub(crate) visible: bool, pub(crate) visible: bool,
pub(crate) active_panel: Option<String>, pub(crate) active_panel: Option<String>,
pub(crate) zoom: bool pub(crate) zoom: bool,
} }
impl Column for DockData { impl Column for DockData {
@ -112,7 +112,7 @@ impl Column for DockData {
DockData { DockData {
visible: visible.unwrap_or(false), visible: visible.unwrap_or(false),
active_panel, active_panel,
zoom: zoom.unwrap_or(false) zoom: zoom.unwrap_or(false),
}, },
next_index, next_index,
)) ))

26
crates/workspace/src/workspace.rs
View File

@ -2906,7 +2906,6 @@ impl Workspace {
.map(|panel| panel.is_zoomed(cx)) .map(|panel| panel.is_zoomed(cx))
.unwrap_or(false); .unwrap_or(false);
let bottom_dock = this.bottom_dock.read(cx); let bottom_dock = this.bottom_dock.read(cx);
let bottom_visible = bottom_dock.is_open(); let bottom_visible = bottom_dock.is_open();
let bottom_active_panel = bottom_dock.visible_panel().and_then(|panel| { let bottom_active_panel = bottom_dock.visible_panel().and_then(|panel| {
@ -2920,22 +2919,21 @@ impl Workspace {
.map(|panel| panel.is_zoomed(cx)) .map(|panel| panel.is_zoomed(cx))
.unwrap_or(false); .unwrap_or(false);
DockStructure { DockStructure {
left: DockData { left: DockData {
visible: left_visible, visible: left_visible,
active_panel: left_active_panel, active_panel: left_active_panel,
zoom: left_dock_zoom zoom: left_dock_zoom,
}, },
right: DockData { right: DockData {
visible: right_visible, visible: right_visible,
active_panel: right_active_panel, active_panel: right_active_panel,
zoom: right_dock_zoom zoom: right_dock_zoom,
}, },
bottom: DockData { bottom: DockData {
visible: bottom_visible, visible: bottom_visible,
active_panel: bottom_active_panel, active_panel: bottom_active_panel,
zoom: bottom_dock_zoom zoom: bottom_dock_zoom,
}, },
} }
} }
@ -3046,24 +3044,25 @@ impl Workspace {
if let Some(active_panel) = docks.left.active_panel { if let Some(active_panel) = docks.left.active_panel {
if let Some(ix) = dock.panel_index_for_ui_name(&active_panel, cx) { if let Some(ix) = dock.panel_index_for_ui_name(&active_panel, cx) {
dock.activate_panel(ix, cx); dock.activate_panel(ix, cx);
}
dock.active_panel() dock.active_panel()
.map(|panel| { .map(|panel| {
panel.set_zoomed(docks.left.zoom, cx) panel.set_zoomed(docks.left.zoom, cx)
}); });
}
} }
}); });
// TODO: I think the bug is that setting zoom or active undoes the bottom zoom or something
workspace.right_dock.update(cx, |dock, cx| { workspace.right_dock.update(cx, |dock, cx| {
dock.set_open(docks.right.visible, cx); dock.set_open(docks.right.visible, cx);
if let Some(active_panel) = docks.right.active_panel { if let Some(active_panel) = docks.right.active_panel {
if let Some(ix) = dock.panel_index_for_ui_name(&active_panel, cx) { if let Some(ix) = dock.panel_index_for_ui_name(&active_panel, cx) {
dock.activate_panel(ix, cx); dock.activate_panel(ix, cx);
}
dock.active_panel() dock.active_panel()
.map(|panel| { .map(|panel| {
panel.set_zoomed(docks.right.zoom, cx) panel.set_zoomed(docks.right.zoom, cx)
}); });
}
} }
}); });
workspace.bottom_dock.update(cx, |dock, cx| { workspace.bottom_dock.update(cx, |dock, cx| {
@ -3071,15 +3070,16 @@ impl Workspace {
if let Some(active_panel) = docks.bottom.active_panel { if let Some(active_panel) = docks.bottom.active_panel {
if let Some(ix) = dock.panel_index_for_ui_name(&active_panel, cx) { if let Some(ix) = dock.panel_index_for_ui_name(&active_panel, cx) {
dock.activate_panel(ix, cx); dock.activate_panel(ix, cx);
dock.active_panel()
.map(|panel| {
panel.set_zoomed(docks.bottom.zoom, cx)
});
} }
} }
dock.active_panel()
.map(|panel| {
panel.set_zoomed(docks.bottom.zoom, cx)
});
}); });
cx.notify(); cx.notify();
})?; })?;