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

Seperate pane and panel styling

Browse source 
co-authored-by: max <max@zed.dev>
This commit is contained in:
Mikayla Maki 2023-05-30 16:23:16 -07:00
parent 9c707eff27
commit 685e8d7007
No known key found for this signature in database
4 changed files with 32 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

2
crates/workspace/src/pane.rs
View file

@ -2,7 +2,7 @@ mod dragged_item_receiver;
use super::{ItemHandle, SplitDirection};
use crate::{
item::WeakItemHandle, toolbar::Toolbar, AutosaveSetting, Item, NewFile, NewSearch, NewTerminal,
item::WeakItemHandle, toolbar::Toolbar, AutosaveSetting, Item, NewFile, NewSearch,
ToggleZoom, Workspace, WorkspaceSettings, NewCenterTerminal,
};
use anyhow::Result;

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

@ -3270,37 +3270,42 @@ impl View for Workspace {
enum ZoomBackground {}
let zoomed = zoomed.upgrade(cx)?;
let mut background_style =
theme.workspace.zoomed_background;
let mut foreground_style;
match self.zoomed_position {
Some(DockPosition::Left) => {
background_style.padding.left = 0.;
background_style.padding.top = 0.;
background_style.padding.bottom = 0.;
background_style.padding.right *= 1.;
foreground_style =
theme.workspace.zoomed_panel_foreground;
foreground_style.margin.left = 0.;
foreground_style.margin.top = 0.;
foreground_style.margin.bottom = 0.;
}
Some(DockPosition::Right) => {
background_style.padding.right = 0.;
background_style.padding.top = 0.;
background_style.padding.bottom = 0.;
background_style.padding.left *= 1.;
foreground_style =
theme.workspace.zoomed_panel_foreground;
foreground_style.margin.right = 0.;
foreground_style.margin.top = 0.;
foreground_style.margin.bottom = 0.;
}
Some(DockPosition::Bottom) => {
background_style.padding.left = 0.;
background_style.padding.right = 0.;
background_style.padding.bottom = 0.;
background_style.padding.top *= 1.;
foreground_style =
theme.workspace.zoomed_panel_foreground;
foreground_style.margin.left = 0.;
foreground_style.margin.right = 0.;
foreground_style.margin.bottom = 0.;
}
None => {
foreground_style =
theme.workspace.zoomed_pane_foreground;
}
None => {}
}
Some(
ChildView::new(&zoomed, cx)
.contained()
.with_style(theme.workspace.zoomed_foreground)
.with_style(foreground_style)
.aligned()
.contained()
.with_style(background_style)
.with_style(theme.workspace.zoomed_background)
.mouse::<ZoomBackground>(0)
.capture_all()
.on_down(