mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-01-24 19:10:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Re-add missing active state (#2664)

Browse source 
[[PR Description]]

Release Notes:

- Fixes project panel active state that was incorrectly removed.
This commit is contained in:
Nate Butler 2023-06-29 14:45:19 -04:00 committed by Max Brunsfeld
parent 8900c18f98
commit d9c1558411
1 changed files with 20 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
styles/src/styleTree/projectPanel.ts
View file

@ -49,7 +49,7 @@ export default function projectPanel(colorScheme: ColorScheme) {
iconColor: foreground(layer, "variant"), iconColor: foreground(layer, "variant"),
iconSize: 7, iconSize: 7,
iconSpacing: 5, iconSpacing: 5,
text: text(layer, "mono", "variant", { size: "sm" }), text: text(layer, "sans", "variant", { size: "sm" }),
status: { status: {
...git_status, ...git_status,
}, },
@ -66,28 +66,37 @@ export default function projectPanel(colorScheme: ColorScheme) {
) )
const unselected_hovered_style = merge( const unselected_hovered_style = merge(
base_properties, base_properties,
{ background: background(layer, "hovered") },
unselected?.hovered ?? {}, unselected?.hovered ?? {},
{ background: background(layer, "variant", "hovered") }
) )
const unselected_clicked_style = merge( const unselected_clicked_style = merge(
base_properties, base_properties,
{ background: background(layer, "pressed") },
unselected?.clicked ?? {}, unselected?.clicked ?? {},
{ background: background(layer, "variant", "pressed") }
) )
const selected_default_style = merge( const selected_default_style = merge(
base_properties, base_properties,
{
background: background(colorScheme.lowest),
text: text(colorScheme.lowest, "sans", { size: "sm" }),
},
selectedStyle?.default ?? {}, selectedStyle?.default ?? {},
{ background: background(layer) }
) )
const selected_hovered_style = merge( const selected_hovered_style = merge(
base_properties, base_properties,
{
background: background(colorScheme.lowest, "hovered"),
text: text(colorScheme.lowest, "sans", { size: "sm" }),
},
selectedStyle?.hovered ?? {}, selectedStyle?.hovered ?? {},
{ background: background(layer, "variant", "hovered") }
) )
const selected_clicked_style = merge( const selected_clicked_style = merge(
base_properties, base_properties,
{
background: background(colorScheme.lowest, "pressed"),
text: text(colorScheme.lowest, "sans", { size: "sm" }),
},
selectedStyle?.clicked ?? {}, selectedStyle?.clicked ?? {},
{ background: background(layer, "variant", "pressed") }
) )
return toggleable({ return toggleable({
@ -150,14 +159,14 @@ export default function projectPanel(colorScheme: ColorScheme) {
entry: defaultEntry, entry: defaultEntry,
draggedEntry: { draggedEntry: {
...defaultEntry.inactive.default, ...defaultEntry.inactive.default,
text: text(layer, "mono", "on", { size: "sm" }), text: text(layer, "sans", "on", { size: "sm" }),
background: withOpacity(background(layer, "on"), 0.9), background: withOpacity(background(layer, "on"), 0.9),
border: border(layer), border: border(layer),
}, },
ignoredEntry: entry( ignoredEntry: entry(
{ {
default: { default: {
text: text(layer, "mono", "disabled"), text: text(layer, "sans", "disabled"),
}, },
}, },
{ {
@ -169,19 +178,19 @@ export default function projectPanel(colorScheme: ColorScheme) {
cutEntry: entry( cutEntry: entry(
{ {
default: { default: {
text: text(layer, "mono", "disabled"), text: text(layer, "sans", "disabled"),
}, },
}, },
{ {
default: { default: {
background: background(layer, "active"), background: background(layer, "active"),
text: text(layer, "mono", "disabled", { size: "sm" }), text: text(layer, "sans", "disabled", { size: "sm" }),
}, },
} }
), ),
filenameEditor: { filenameEditor: {
background: background(layer, "on"), background: background(layer, "on"),
text: text(layer, "mono", "on", { size: "sm" }), text: text(layer, "sans", "on", { size: "sm" }),
selection: colorScheme.players[0], selection: colorScheme.players[0],
}, },
} }