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

Update some status bar icons and states

Browse source
This commit is contained in:
Nate Butler 2023-08-14 17:15:25 -04:00
parent b4b044ccbf
commit ef73e77d3d
5 changed files with 22 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

2
crates/feedback/src/deploy_feedback_button.rs
View file

@ -44,7 +44,7 @@ impl View for DeployFeedbackButton {
.in_state(active) .in_state(active)
.style_for(state); .style_for(state);
Svg::new("icons/feedback_16.svg") Svg::new("icons/feedback.svg")
.with_color(style.icon_color) .with_color(style.icon_color)
.constrained() .constrained()
.with_width(style.icon_size) .with_width(style.icon_size)

2
crates/project_panel/src/project_panel.rs
View file

@ -1658,7 +1658,7 @@ impl workspace::dock::Panel for ProjectPanel {
} }
fn icon_path(&self, _: &WindowContext) -> Option<&'static str> { fn icon_path(&self, _: &WindowContext) -> Option<&'static str> {
Some("icons/folder_tree_16.svg") Some("icons/project.svg")
} }
fn icon_tooltip(&self) -> (String, Option<Box<dyn Action>>) { fn icon_tooltip(&self) -> (String, Option<Box<dyn Action>>) {

2
crates/terminal_view/src/terminal_panel.rs
View file

@ -394,7 +394,7 @@ impl Panel for TerminalPanel {
} }
fn icon_path(&self, _: &WindowContext) -> Option<&'static str> { fn icon_path(&self, _: &WindowContext) -> Option<&'static str> {
Some("icons/terminal_12.svg") Some("icons/terminal.svg")
} }
fn icon_tooltip(&self) -> (String, Option<Box<dyn Action>>) { fn icon_tooltip(&self) -> (String, Option<Box<dyn Action>>) {

2
crates/terminal_view/src/terminal_view.rs
View file

@ -667,7 +667,7 @@ impl Item for TerminalView {
Flex::row() Flex::row()
.with_child( .with_child(
gpui::elements::Svg::new("icons/terminal_12.svg") gpui::elements::Svg::new("icons/terminal.svg")
.with_color(tab_theme.label.text.color) .with_color(tab_theme.label.text.color)
.constrained() .constrained()
.with_width(tab_theme.type_icon_width) .with_width(tab_theme.type_icon_width)

33
styles/src/style_tree/status_bar.ts
View file

@ -28,16 +28,16 @@ export default function status_bar(): any {
right: 6, right: 6,
}, },
border: border(layer, { top: true, overlay: true }), border: border(layer, { top: true, overlay: true }),
cursor_position: text(layer, "sans", "variant", { size: "xs" }), cursor_position: text(layer, "sans", "base", { size: "xs" }),
vim_mode_indicator: { vim_mode_indicator: {
margin: { left: 6 }, margin: { left: 6 },
...text(layer, "mono", "variant", { size: "xs" }), ...text(layer, "mono", "base", { size: "xs" }),
}, },
active_language: text_button({ active_language: text_button({
color: "variant" color: "base"
}), }),
auto_update_progress_message: text(layer, "sans", "variant", { size: "xs" }), auto_update_progress_message: text(layer, "sans", "base", { size: "xs" }),
auto_update_done_message: text(layer, "sans", "variant", { size: "xs" }), auto_update_done_message: text(layer, "sans", "base", { size: "xs" }),
lsp_status: interactive({ lsp_status: interactive({
base: { base: {
...diagnostic_status_container, ...diagnostic_status_container,
@ -64,11 +64,11 @@ export default function status_bar(): any {
diagnostic_summary: interactive({ diagnostic_summary: interactive({
base: { base: {
height: 20, height: 20,
icon_width: 16, icon_width: 14,
icon_spacing: 2, icon_spacing: 2,
summary_spacing: 6, summary_spacing: 6,
text: text(layer, "sans", { size: "sm" }), text: text(layer, "sans", { size: "sm" }),
icon_color_ok: foreground(layer, "variant"), icon_color_ok: foreground(layer, "base"),
icon_color_warning: foreground(layer, "warning"), icon_color_warning: foreground(layer, "warning"),
icon_color_error: foreground(layer, "negative"), icon_color_error: foreground(layer, "negative"),
container_ok: { container_ok: {
@ -111,8 +111,9 @@ export default function status_bar(): any {
base: interactive({ base: interactive({
base: { base: {
...status_container, ...status_container,
icon_size: 16, icon_size: 14,
icon_color: foreground(layer, "variant"), icon_color: foreground(layer, "base"),
background: background(layer, "default"),
label: { label: {
margin: { left: 6 }, margin: { left: 6 },
...text(layer, "sans", { size: "xs" }), ...text(layer, "sans", { size: "xs" }),
@ -120,23 +121,25 @@ export default function status_bar(): any {
}, },
state: { state: {
hovered: { hovered: {
icon_color: foreground(layer, "hovered"), background: background(layer, "hovered"),
background: background(layer, "variant"),
}, },
clicked: {
background: background(layer, "pressed"),
}
}, },
}), }),
state: { state: {
active: { active: {
default: { default: {
icon_color: foreground(layer, "active"), icon_color: foreground(layer, "accent", "default"),
background: background(layer, "active"), background: background(layer, "default"),
}, },
hovered: { hovered: {
icon_color: foreground(layer, "hovered"), icon_color: foreground(layer, "accent", "hovered"),
background: background(layer, "hovered"), background: background(layer, "hovered"),
}, },
clicked: { clicked: {
icon_color: foreground(layer, "pressed"), icon_color: foreground(layer, "accent", "pressed"),
background: background(layer, "pressed"), background: background(layer, "pressed"),
}, },
}, },