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

Merge pull request #1414 from zed-industries/fix-theme-issues

Browse source 
Fix tab bar themes
This commit is contained in:
Keith Simmons 2022-07-26 11:55:17 -07:00 • committed by GitHub
commit 4ff007eaab
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 123 additions and 91 deletions
Download patch file Download diff file Expand all files Collapse all files

22
crates/theme/src/theme.rs
View file

@ -38,11 +38,7 @@ pub struct Theme {
pub struct Workspace {
pub background: Color,
pub titlebar: Titlebar,
pub active_pane_active_tab: Tab,
pub active_pane_inactive_tab: Tab,
pub inactive_pane_active_tab: Tab,
pub inactive_pane_inactive_tab: Tab,
pub pane_button: Interactive<IconButton>,
pub tab_bar: TabBar,
pub pane_divider: Border,
pub leader_border_opacity: f32,
pub leader_border_width: f32,
@ -72,6 +68,22 @@ pub struct Titlebar {
pub outdated_warning: ContainedText,
}
#[derive(Clone, Deserialize, Default)]
pub struct TabBar {
#[serde(flatten)]
pub container: ContainerStyle,
pub pane_button: Interactive<IconButton>,
pub active_pane: TabStyles,
pub inactive_pane: TabStyles,
pub height: f32,
}
#[derive(Clone, Deserialize, Default)]
pub struct TabStyles {
pub active_tab: Tab,
pub inactive_tab: Tab,
}
#[derive(Clone, Deserialize, Default)]
pub struct AvatarRibbon {
#[serde(flatten)]