oak-team/oak-gpui
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Restructure Theme with new style objects

Browse Source
This commit is contained in:
Max Brunsfeld
2021-08-03 13:36:58 -07:00
parent ef0ffbe819
commit 81041d7841
10 changed files with 218 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zed/src/workspace/pane.rs
+24 -19
View File
@@ -1,5 +1,5 @@
use super::{ItemViewHandle, SplitDirection};
use crate::settings::{Settings, UiTheme};
use crate::{settings::Settings, theme};
use gpui::{
color::Color,
elements::*,
@@ -193,6 +193,7 @@ impl Pane {
let is_active = ix == self.active_item;
enum Tab {}
let border = &theme.tab.container.border;
row.add_child(
Expanded::new(
@@ -200,10 +201,10 @@ impl Pane {
MouseEventHandler::new::<Tab, _>(item.id(), cx, |mouse_state| {
let title = item.title(cx);
let mut border = Border::new(1.0, theme.tab_border);
let mut border = border.clone();
border.left = ix > 0;
border.right = ix == last_item_ix;
border.bottom = ix != self.active_item;
border.bottom = !is_active;
let mut container = Container::new(
Stack::new()
@@ -214,10 +215,10 @@ impl Pane {
settings.ui_font_family,
settings.ui_font_size,
)
.with_default_color(if is_active {
theme.tab_text_active
.with_style(if is_active {
&theme.active_tab.label
} else {
theme.tab_text
&theme.tab.label
})
.boxed(),
)
@@ -238,15 +239,16 @@ impl Pane {
)
.boxed(),
)
.with_style(if is_active {
&theme.active_tab.container
} else {
&theme.tab.container
})
.with_horizontal_padding(10.)
.with_border(border);
if is_active {
container = container
.with_background_color(theme.tab_background_active)
.with_padding_bottom(border.width);
} else {
container = container.with_background_color(theme.tab_background);
container = container.with_padding_bottom(border.width);
}
ConstrainedBox::new(
@@ -269,10 +271,13 @@ impl Pane {
// Ensure there's always a minimum amount of space after the last tab,
// so that the tab's border doesn't abut the window's border.
let mut border = Border::bottom(1.0, Color::default());
border.color = theme.tab.container.border.color;
row.add_child(
ConstrainedBox::new(
Container::new(Empty::new().boxed())
.with_border(Border::bottom(1.0, theme.tab_border))
.with_border(border)
.boxed(),
)
.with_min_width(20.)
@@ -283,7 +288,7 @@ impl Pane {
Expanded::new(
0.0,
Container::new(Empty::new().boxed())
.with_border(Border::bottom(1.0, theme.tab_border))
.with_border(border)
.boxed(),
)
.named("filler"),
@@ -300,24 +305,24 @@ impl Pane {
tab_hovered: bool,
is_dirty: bool,
has_conflict: bool,
theme: &UiTheme,
theme: &theme::Ui,
cx: &AppContext,
) -> ElementBox {
enum TabCloseButton {}
let mut clicked_color = theme.tab_icon_dirty;
let mut clicked_color = theme.tab.icon_dirty;
clicked_color.a = 180;
let current_color = if has_conflict {
Some(theme.tab_icon_conflict)
Some(theme.tab.icon_conflict)
} else if is_dirty {
Some(theme.tab_icon_dirty)
Some(theme.tab.icon_dirty)
} else {
None
};
let icon = if tab_hovered {
let close_color = current_color.unwrap_or(theme.tab_icon_close);
let close_color = current_color.unwrap_or(theme.tab.icon_close);
let icon = Svg::new("icons/x.svg").with_color(close_color);
MouseEventHandler::new::<TabCloseButton, _>(item_id, cx, |mouse_state| {
@@ -326,7 +331,7 @@ impl Pane {
.with_background_color(if mouse_state.clicked {
clicked_color
} else {
theme.tab_icon_dirty
theme.tab.icon_dirty
})
.with_corner_radius(close_icon_size / 2.)
.boxed()