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

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 GitHub
commit ae9eb7c67a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 25 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

36
styles/src/style_tree/project_panel.ts
View file

@ -47,7 +47,7 @@ export default function project_panel(theme: ColorScheme): any {
icon_color: foreground(theme.middle, "variant"), icon_color: foreground(theme.middle, "variant"),
icon_size: 7, icon_size: 7,
icon_spacing: 5, icon_spacing: 5,
text: text(theme.middle, "mono", "variant", { size: "sm" }), text: text(theme.middle, "sans", "variant", { size: "sm" }),
status: { status: {
...git_status, ...git_status,
}, },
@ -64,28 +64,42 @@ export default function project_panel(theme: ColorScheme): any {
) )
const unselected_hovered_style = merge( const unselected_hovered_style = merge(
base_properties, base_properties,
{ background: background(theme.middle, "hovered") },
unselected?.hovered ?? {}, unselected?.hovered ?? {},
{ background: background(theme.middle, "variant", "hovered") }
) )
const unselected_clicked_style = merge( const unselected_clicked_style = merge(
base_properties, base_properties,
{ background: background(theme.middle, "pressed"), }
,
unselected?.clicked ?? {}, unselected?.clicked ?? {},
{ background: background(theme.middle, "variant", "pressed") }
) )
const selected_default_style = merge( const selected_default_style = merge(
base_properties, base_properties,
{
background: background(theme.lowest),
text: text(theme.lowest, "sans", { size: "sm" }),
},
selected_style?.default ?? {}, selected_style?.default ?? {},
{ background: background(theme.middle) }
) )
const selected_hovered_style = merge( const selected_hovered_style = merge(
base_properties, base_properties,
{
background: background(theme.lowest, "hovered"),
text: text(theme.lowest, "sans", { size: "sm" }),
},
selected_style?.hovered ?? {}, selected_style?.hovered ?? {},
{ background: background(theme.middle, "variant", "hovered") }
) )
const selected_clicked_style = merge( const selected_clicked_style = merge(
base_properties, base_properties,
{
background: background(theme.lowest, "pressed"),
text: text(theme.lowest, "sans", { size: "sm" }),
},
selected_style?.clicked ?? {}, selected_style?.clicked ?? {},
{ background: background(theme.middle, "variant", "pressed") }
) )
return toggleable({ return toggleable({
@ -148,14 +162,14 @@ export default function project_panel(theme: ColorScheme): any {
entry: default_entry, entry: default_entry,
dragged_entry: { dragged_entry: {
...default_entry.inactive.default, ...default_entry.inactive.default,
text: text(theme.middle, "mono", "on", { size: "sm" }), text: text(theme.middle, "sans", "on", { size: "sm" }),
background: with_opacity(background(theme.middle, "on"), 0.9), background: with_opacity(background(theme.middle, "on"), 0.9),
border: border(theme.middle), border: border(theme.middle),
}, },
ignored_entry: entry( ignored_entry: entry(
{ {
default: { default: {
text: text(theme.middle, "mono", "disabled"), text: text(theme.middle, "sans", "disabled"),
}, },
}, },
{ {
@ -167,13 +181,13 @@ export default function project_panel(theme: ColorScheme): any {
cut_entry: entry( cut_entry: entry(
{ {
default: { default: {
text: text(theme.middle, "mono", "disabled"), text: text(theme.middle, "sans", "disabled"),
}, },
}, },
{ {
default: { default: {
background: background(theme.middle, "active"), background: background(theme.middle, "active"),
text: text(theme.middle, "mono", "disabled", { text: text(theme.middle, "sans", "disabled", {
size: "sm", size: "sm",
}), }),
}, },
@ -181,7 +195,7 @@ export default function project_panel(theme: ColorScheme): any {
), ),
filename_editor: { filename_editor: {
background: background(theme.middle, "on"), background: background(theme.middle, "on"),
text: text(theme.middle, "mono", "on", { size: "sm" }), text: text(theme.middle, "sans", "on", { size: "sm" }),
selection: theme.players[0], selection: theme.players[0],
}, },
} }