Added the ability to enable borders for the bar. (#428)

* Added the ability to configure a border for the bar.

* Added the right color for configs
This commit is contained in:
Jas Singh
2024-11-03 02:09:13 -08:00
committed by GitHub
parent 16457ad641
commit 9287e1d6a4
49 changed files with 490 additions and 395 deletions

View File

@@ -217,3 +217,5 @@ export type ColorMapValue = (typeof defaultColorMap)[ColorMapKey];
export type ScalingPriority = 'gdk' | 'hyprland' | 'both'; export type ScalingPriority = 'gdk' | 'hyprland' | 'both';
export type BluetoothBatteryState = 'paired' | 'connected' | 'always'; export type BluetoothBatteryState = 'paired' | 'connected' | 'always';
export type BorderLocation = 'none' | 'top' | 'right' | 'bottom' | 'left' | 'horizontal' | 'vertical' | 'full';

View File

@@ -38,6 +38,7 @@ import Window from 'types/widgets/window.js';
const { layouts } = options.bar; const { layouts } = options.bar;
const { location } = options.theme.bar; const { location } = options.theme.bar;
const { location: borderLocation } = options.theme.bar.border;
export type BarWidget = keyof typeof widget; export type BarWidget = keyof typeof widget;
@@ -270,7 +271,9 @@ export const Bar = (() => {
child: Widget.Box({ child: Widget.Box({
class_name: 'bar-panel-container', class_name: 'bar-panel-container',
child: Widget.CenterBox({ child: Widget.CenterBox({
class_name: 'bar-panel', class_name: borderLocation
.bind('value')
.as((brdrLcn) => (brdrLcn !== 'none' ? 'bar-panel withBorder' : 'bar-panel')),
css: 'padding: 1px', css: 'padding: 1px',
startWidget: Widget.Box({ startWidget: Widget.Box({
class_name: 'box-left', class_name: 'box-left',

View File

@@ -6,6 +6,7 @@ import {
BarButtonStyles, BarButtonStyles,
BarLocation, BarLocation,
BluetoothBatteryState, BluetoothBatteryState,
BorderLocation,
NotificationAnchor, NotificationAnchor,
OSDAnchor, OSDAnchor,
OSDOrientation, OSDOrientation,
@@ -158,6 +159,11 @@ const options = mkOptions(OPTIONS, {
transparent: opt(false), transparent: opt(false),
dropdownGap: opt('2.9em'), dropdownGap: opt('2.9em'),
background: opt(colors.crust), background: opt(colors.crust),
border: {
location: opt<BorderLocation>('none'),
width: opt('0.15em'),
color: opt(colors.lavender),
},
buttons: { buttons: {
style: opt<BarButtonStyles>('default'), style: opt<BarButtonStyles>('default'),
enableBorders: opt(false), enableBorders: opt(false),

View File

@@ -399,6 +399,7 @@ const main = () => {
// Format: "target_key": "source_key" // Format: "target_key": "source_key"
const specialKeyMappings = { const specialKeyMappings = {
'theme.bar.menus.menu.network.switch.enabled': 'theme.bar.menus.menu.network.iconbuttons.active', 'theme.bar.menus.menu.network.switch.enabled': 'theme.bar.menus.menu.network.iconbuttons.active',
'theme.bar.border.color': 'theme.bar.buttons.notifications.border',
// Add more special mappings here if needed // Add more special mappings here if needed
}; };

View File

@@ -15,6 +15,31 @@
$transparency-value: 1 - $bar-opacity-ratio; $transparency-value: 1 - $bar-opacity-ratio;
background: if($bar-transparent, transparent, transparentize($bar-background, $transparency-value)); background: if($bar-transparent, transparent, transparentize($bar-background, $transparency-value));
border-radius: if($bar-floating, $bar-border_radius, 0em); border-radius: if($bar-floating, $bar-border_radius, 0em);
&.withBorder {
border-top: if(
$bar-border_location == 'top' or $bar-border_location == 'horizontal' or $bar-border_location == 'full',
$bar-border_width solid,
none
);
border-bottom: if(
$bar-border_location == 'bottom' or $bar-border_location == 'horizontal' or $bar-border_location ==
'full',
$bar-border_width solid,
none
);
border-left: if(
$bar-border_location == 'left' or $bar-border_location == 'vertical' or $bar-border_location == 'full',
$bar-border_width solid,
none
);
border-right: if(
$bar-border_location == 'right' or $bar-border_location == 'vertical' or $bar-border_location == 'full',
$bar-border_width solid,
none
);
border-color: $bar-border_color;
}
} }
} }

View File

@@ -341,5 +341,6 @@
"theme.bar.menus.menu.network.switch.enabled": "#ca9ee6", "theme.bar.menus.menu.network.switch.enabled": "#ca9ee6",
"theme.bar.menus.menu.network.switch.disabled": "#414559", "theme.bar.menus.menu.network.switch.disabled": "#414559",
"theme.bar.menus.menu.network.switch.puck": "#51576d", "theme.bar.menus.menu.network.switch.puck": "#51576d",
"theme.bar.buttons.systray.customIcon": "#c6d0f5" "theme.bar.buttons.systray.customIcon": "#c6d0f5",
"theme.bar.border.color": "#babbf1"
} }

View File

@@ -341,5 +341,6 @@
"theme.bar.menus.menu.network.switch.enabled": "#ca9ee6", "theme.bar.menus.menu.network.switch.enabled": "#ca9ee6",
"theme.bar.menus.menu.network.switch.disabled": "#414559", "theme.bar.menus.menu.network.switch.disabled": "#414559",
"theme.bar.menus.menu.network.switch.puck": "#51576d", "theme.bar.menus.menu.network.switch.puck": "#51576d",
"theme.bar.buttons.systray.customIcon": "#c6d0f5" "theme.bar.buttons.systray.customIcon": "#c6d0f5",
"theme.bar.border.color": "#babbf1"
} }

View File

@@ -341,5 +341,6 @@
"theme.bar.menus.menu.network.switch.puck": "#51576d", "theme.bar.menus.menu.network.switch.puck": "#51576d",
"theme.bar.menus.menu.network.switch.disabled": "#414559", "theme.bar.menus.menu.network.switch.disabled": "#414559",
"theme.bar.menus.menu.network.switch.enabled": "#ca9ee6", "theme.bar.menus.menu.network.switch.enabled": "#ca9ee6",
"theme.bar.buttons.systray.customIcon": "#c6d0f5" "theme.bar.buttons.systray.customIcon": "#c6d0f5",
"theme.bar.border.color": "#babbf1"
} }

View File

@@ -341,5 +341,6 @@
"theme.bar.menus.menu.network.switch.enabled": "#8839ef", "theme.bar.menus.menu.network.switch.enabled": "#8839ef",
"theme.bar.menus.menu.network.switch.disabled": "#ccd0da", "theme.bar.menus.menu.network.switch.disabled": "#ccd0da",
"theme.bar.menus.menu.network.switch.puck": "#bcc0cc", "theme.bar.menus.menu.network.switch.puck": "#bcc0cc",
"theme.bar.buttons.systray.customIcon": "#4c4f69" "theme.bar.buttons.systray.customIcon": "#4c4f69",
"theme.bar.border.color": "#7287fd"
} }

View File

@@ -341,5 +341,6 @@
"theme.bar.menus.menu.network.switch.enabled": "#8839ef", "theme.bar.menus.menu.network.switch.enabled": "#8839ef",
"theme.bar.menus.menu.network.switch.disabled": "#ccd0da", "theme.bar.menus.menu.network.switch.disabled": "#ccd0da",
"theme.bar.menus.menu.network.switch.puck": "#bcc0cc", "theme.bar.menus.menu.network.switch.puck": "#bcc0cc",
"theme.bar.buttons.systray.customIcon": "#4c4f69" "theme.bar.buttons.systray.customIcon": "#4c4f69",
"theme.bar.border.color": "#7287fd"
} }

View File

@@ -341,5 +341,6 @@
"theme.bar.menus.menu.network.switch.puck": "#bcc0cc", "theme.bar.menus.menu.network.switch.puck": "#bcc0cc",
"theme.bar.menus.menu.network.switch.disabled": "#ccd0da", "theme.bar.menus.menu.network.switch.disabled": "#ccd0da",
"theme.bar.menus.menu.network.switch.enabled": "#8839ef", "theme.bar.menus.menu.network.switch.enabled": "#8839ef",
"theme.bar.buttons.systray.customIcon": "#4c4f69" "theme.bar.buttons.systray.customIcon": "#4c4f69",
"theme.bar.border.color": "#7287fd"
} }

View File

@@ -341,5 +341,6 @@
"theme.bar.menus.menu.network.switch.enabled": "#c6a0f6", "theme.bar.menus.menu.network.switch.enabled": "#c6a0f6",
"theme.bar.menus.menu.network.switch.disabled": "#363a4f", "theme.bar.menus.menu.network.switch.disabled": "#363a4f",
"theme.bar.menus.menu.network.switch.puck": "#494d64", "theme.bar.menus.menu.network.switch.puck": "#494d64",
"theme.bar.buttons.systray.customIcon": "#cad3f5" "theme.bar.buttons.systray.customIcon": "#cad3f5",
"theme.bar.border.color": "#b7bdf8"
} }

View File

@@ -341,5 +341,6 @@
"theme.bar.menus.menu.network.switch.enabled": "#c6a0f6", "theme.bar.menus.menu.network.switch.enabled": "#c6a0f6",
"theme.bar.menus.menu.network.switch.disabled": "#363a4f", "theme.bar.menus.menu.network.switch.disabled": "#363a4f",
"theme.bar.menus.menu.network.switch.puck": "#494d64", "theme.bar.menus.menu.network.switch.puck": "#494d64",
"theme.bar.buttons.systray.customIcon": "#cad3f5" "theme.bar.buttons.systray.customIcon": "#cad3f5",
"theme.bar.border.color": "#b7bdf8"
} }

View File

@@ -341,5 +341,6 @@
"theme.bar.menus.menu.network.switch.puck": "#494d64", "theme.bar.menus.menu.network.switch.puck": "#494d64",
"theme.bar.menus.menu.network.switch.disabled": "#363a4f", "theme.bar.menus.menu.network.switch.disabled": "#363a4f",
"theme.bar.menus.menu.network.switch.enabled": "#c6a0f6", "theme.bar.menus.menu.network.switch.enabled": "#c6a0f6",
"theme.bar.buttons.systray.customIcon": "#cad3f5" "theme.bar.buttons.systray.customIcon": "#cad3f5",
"theme.bar.border.color": "#b7bdf8"
} }

View File

@@ -341,5 +341,6 @@
"theme.bar.buttons.modules.submap.border": "#94e2d5", "theme.bar.buttons.modules.submap.border": "#94e2d5",
"theme.bar.menus.menu.network.switch.enabled": "#cba6f7", "theme.bar.menus.menu.network.switch.enabled": "#cba6f7",
"theme.bar.menus.menu.network.switch.disabled": "#313245", "theme.bar.menus.menu.network.switch.disabled": "#313245",
"theme.bar.menus.menu.network.switch.puck": "#454759" "theme.bar.menus.menu.network.switch.puck": "#454759",
"theme.bar.border.color": "#b4befe"
} }

View File

@@ -341,5 +341,7 @@
"theme.bar.buttons.modules.submap.border": "#94e2d5", "theme.bar.buttons.modules.submap.border": "#94e2d5",
"theme.bar.menus.menu.network.switch.enabled": "#cba6f7", "theme.bar.menus.menu.network.switch.enabled": "#cba6f7",
"theme.bar.menus.menu.network.switch.disabled": "#313245", "theme.bar.menus.menu.network.switch.disabled": "#313245",
"theme.bar.menus.menu.network.switch.puck": "#454759" "theme.bar.menus.menu.network.switch.puck": "#454759",
"theme.bar.border.color": "#b4befe"
} }

View File

@@ -341,6 +341,6 @@
"theme.notification.label": "#b4befe", "theme.notification.label": "#b4befe",
"theme.notification.actions.text": "#181825", "theme.notification.actions.text": "#181825",
"theme.notification.actions.background": "#b4befd", "theme.notification.actions.background": "#b4befd",
"theme.notification.background": "#181826" "theme.notification.background": "#181826",
"theme.bar.border.color": "#b4befe"
} }

View File

@@ -341,5 +341,6 @@
"theme.bar.menus.menu.network.switch.enabled": "#FF69B4", "theme.bar.menus.menu.network.switch.enabled": "#FF69B4",
"theme.bar.menus.menu.network.switch.disabled": "#2A2A2A", "theme.bar.menus.menu.network.switch.disabled": "#2A2A2A",
"theme.bar.menus.menu.network.switch.puck": "#333333", "theme.bar.menus.menu.network.switch.puck": "#333333",
"theme.bar.buttons.systray.customIcon": "#d1d1d1" "theme.bar.buttons.systray.customIcon": "#d1d1d1",
"theme.bar.border.color": "#f7d04b"
} }

View File

@@ -341,5 +341,6 @@
"theme.bar.menus.menu.network.switch.enabled": "#FF69B4", "theme.bar.menus.menu.network.switch.enabled": "#FF69B4",
"theme.bar.menus.menu.network.switch.disabled": "#2A2A2A", "theme.bar.menus.menu.network.switch.disabled": "#2A2A2A",
"theme.bar.menus.menu.network.switch.puck": "#333333", "theme.bar.menus.menu.network.switch.puck": "#333333",
"theme.bar.buttons.systray.customIcon": "#d1d1d1" "theme.bar.buttons.systray.customIcon": "#d1d1d1",
"theme.bar.border.color": "#f7d04b"
} }

View File

@@ -341,5 +341,6 @@
"theme.bar.menus.menu.network.switch.puck": "#333333", "theme.bar.menus.menu.network.switch.puck": "#333333",
"theme.bar.menus.menu.network.switch.disabled": "#2A2A2A", "theme.bar.menus.menu.network.switch.disabled": "#2A2A2A",
"theme.bar.menus.menu.network.switch.enabled": "#FF69B4", "theme.bar.menus.menu.network.switch.enabled": "#FF69B4",
"theme.bar.buttons.systray.customIcon": "#d1d1d1" "theme.bar.buttons.systray.customIcon": "#d1d1d1",
"theme.bar.border.color": "#f7d04b"
} }

View File

@@ -341,5 +341,6 @@
"theme.bar.menus.menu.network.switch.enabled": "#bd93f9", "theme.bar.menus.menu.network.switch.enabled": "#bd93f9",
"theme.bar.menus.menu.network.switch.disabled": "#44475a", "theme.bar.menus.menu.network.switch.disabled": "#44475a",
"theme.bar.menus.menu.network.switch.puck": "#44475a", "theme.bar.menus.menu.network.switch.puck": "#44475a",
"theme.bar.buttons.systray.customIcon": "#f8f8f2" "theme.bar.buttons.systray.customIcon": "#f8f8f2",
"theme.bar.border.color": "#bd93f9"
} }

View File

@@ -341,5 +341,6 @@
"theme.bar.menus.menu.network.switch.enabled": "#bd93f9", "theme.bar.menus.menu.network.switch.enabled": "#bd93f9",
"theme.bar.menus.menu.network.switch.disabled": "#44475a", "theme.bar.menus.menu.network.switch.disabled": "#44475a",
"theme.bar.menus.menu.network.switch.puck": "#44475a", "theme.bar.menus.menu.network.switch.puck": "#44475a",
"theme.bar.buttons.systray.customIcon": "#f8f8f2" "theme.bar.buttons.systray.customIcon": "#f8f8f2",
"theme.bar.border.color": "#bd93f9"
} }

View File

@@ -341,5 +341,6 @@
"theme.bar.menus.menu.network.switch.puck": "#44475a", "theme.bar.menus.menu.network.switch.puck": "#44475a",
"theme.bar.menus.menu.network.switch.disabled": "#44475a", "theme.bar.menus.menu.network.switch.disabled": "#44475a",
"theme.bar.menus.menu.network.switch.enabled": "#bd93f9", "theme.bar.menus.menu.network.switch.enabled": "#bd93f9",
"theme.bar.buttons.systray.customIcon": "#f8f8f2" "theme.bar.buttons.systray.customIcon": "#f8f8f2",
"theme.bar.border.color": "#bd93f9"
} }

View File

@@ -341,5 +341,6 @@
"theme.bar.menus.menu.network.switch.enabled": "#e69875", "theme.bar.menus.menu.network.switch.enabled": "#e69875",
"theme.bar.menus.menu.network.switch.disabled": "#2f383e", "theme.bar.menus.menu.network.switch.disabled": "#2f383e",
"theme.bar.menus.menu.network.switch.puck": "#454b53", "theme.bar.menus.menu.network.switch.puck": "#454b53",
"theme.bar.buttons.systray.customIcon": "#d8caac" "theme.bar.buttons.systray.customIcon": "#d8caac",
"theme.bar.border.color": "#83c092"
} }

View File

@@ -341,5 +341,6 @@
"theme.bar.menus.menu.network.switch.enabled": "#e69875", "theme.bar.menus.menu.network.switch.enabled": "#e69875",
"theme.bar.menus.menu.network.switch.disabled": "#2f383e", "theme.bar.menus.menu.network.switch.disabled": "#2f383e",
"theme.bar.menus.menu.network.switch.puck": "#454b53", "theme.bar.menus.menu.network.switch.puck": "#454b53",
"theme.bar.buttons.systray.customIcon": "#d8caac" "theme.bar.buttons.systray.customIcon": "#d8caac",
"theme.bar.border.color": "#83c092"
} }

View File

@@ -341,5 +341,6 @@
"theme.bar.menus.menu.network.switch.puck": "#454b53", "theme.bar.menus.menu.network.switch.puck": "#454b53",
"theme.bar.menus.menu.network.switch.disabled": "#2f383e", "theme.bar.menus.menu.network.switch.disabled": "#2f383e",
"theme.bar.menus.menu.network.switch.enabled": "#e69875", "theme.bar.menus.menu.network.switch.enabled": "#e69875",
"theme.bar.buttons.systray.customIcon": "#d8caac" "theme.bar.buttons.systray.customIcon": "#d8caac",
"theme.bar.border.color": "#83c092"
} }

View File

@@ -341,5 +341,6 @@
"theme.bar.menus.menu.network.switch.enabled": "#b16286", "theme.bar.menus.menu.network.switch.enabled": "#b16286",
"theme.bar.menus.menu.network.switch.disabled": "#3c3836", "theme.bar.menus.menu.network.switch.disabled": "#3c3836",
"theme.bar.menus.menu.network.switch.puck": "#504945", "theme.bar.menus.menu.network.switch.puck": "#504945",
"theme.bar.buttons.systray.customIcon": "#ebdbb2" "theme.bar.buttons.systray.customIcon": "#ebdbb2",
"theme.bar.border.color": "#83a598"
} }

View File

@@ -341,5 +341,6 @@
"theme.bar.menus.menu.network.switch.enabled": "#b16286", "theme.bar.menus.menu.network.switch.enabled": "#b16286",
"theme.bar.menus.menu.network.switch.disabled": "#3c3836", "theme.bar.menus.menu.network.switch.disabled": "#3c3836",
"theme.bar.menus.menu.network.switch.puck": "#504945", "theme.bar.menus.menu.network.switch.puck": "#504945",
"theme.bar.buttons.systray.customIcon": "#ebdbb2" "theme.bar.buttons.systray.customIcon": "#ebdbb2",
"theme.bar.border.color": "#83a598"
} }

View File

@@ -341,5 +341,6 @@
"theme.bar.menus.menu.network.switch.puck": "#504945", "theme.bar.menus.menu.network.switch.puck": "#504945",
"theme.bar.menus.menu.network.switch.disabled": "#3c3836", "theme.bar.menus.menu.network.switch.disabled": "#3c3836",
"theme.bar.menus.menu.network.switch.enabled": "#b16286", "theme.bar.menus.menu.network.switch.enabled": "#b16286",
"theme.bar.buttons.systray.customIcon": "#ebdbb2" "theme.bar.buttons.systray.customIcon": "#ebdbb2",
"theme.bar.border.color": "#83a598"
} }

View File

@@ -341,5 +341,6 @@
"theme.bar.menus.menu.network.switch.enabled": "#FFFFFF", "theme.bar.menus.menu.network.switch.enabled": "#FFFFFF",
"theme.bar.menus.menu.network.switch.disabled": "#444444", "theme.bar.menus.menu.network.switch.disabled": "#444444",
"theme.bar.menus.menu.network.switch.puck": "#333333", "theme.bar.menus.menu.network.switch.puck": "#333333",
"theme.bar.buttons.systray.customIcon": "#FFFFFF" "theme.bar.buttons.systray.customIcon": "#FFFFFF",
"theme.bar.border.color": "#FFFFFF"
} }

View File

@@ -341,5 +341,6 @@
"theme.bar.menus.menu.network.switch.enabled": "#FFFFFF", "theme.bar.menus.menu.network.switch.enabled": "#FFFFFF",
"theme.bar.menus.menu.network.switch.disabled": "#444444", "theme.bar.menus.menu.network.switch.disabled": "#444444",
"theme.bar.menus.menu.network.switch.puck": "#333333", "theme.bar.menus.menu.network.switch.puck": "#333333",
"theme.bar.buttons.systray.customIcon": "#FFFFFF" "theme.bar.buttons.systray.customIcon": "#FFFFFF",
"theme.bar.border.color": "#FFFFFF"
} }

View File

@@ -341,5 +341,6 @@
"theme.bar.menus.menu.network.switch.puck": "#333333", "theme.bar.menus.menu.network.switch.puck": "#333333",
"theme.bar.menus.menu.network.switch.disabled": "#444444", "theme.bar.menus.menu.network.switch.disabled": "#444444",
"theme.bar.menus.menu.network.switch.enabled": "#FFFFFF", "theme.bar.menus.menu.network.switch.enabled": "#FFFFFF",
"theme.bar.buttons.systray.customIcon": "#FFFFFF" "theme.bar.buttons.systray.customIcon": "#FFFFFF",
"theme.bar.border.color": "#FFFFFF"
} }

View File

@@ -341,5 +341,6 @@
"theme.bar.menus.menu.network.switch.enabled": "#88c0d0", "theme.bar.menus.menu.network.switch.enabled": "#88c0d0",
"theme.bar.menus.menu.network.switch.disabled": "#434c53", "theme.bar.menus.menu.network.switch.disabled": "#434c53",
"theme.bar.menus.menu.network.switch.puck": "#434c53", "theme.bar.menus.menu.network.switch.puck": "#434c53",
"theme.bar.buttons.systray.customIcon": "#d8dee9" "theme.bar.buttons.systray.customIcon": "#d8dee9",
"theme.bar.border.color": "#88c0d0"
} }

View File

@@ -341,5 +341,6 @@
"theme.bar.menus.menu.network.switch.enabled": "#88c0d0", "theme.bar.menus.menu.network.switch.enabled": "#88c0d0",
"theme.bar.menus.menu.network.switch.disabled": "#434c53", "theme.bar.menus.menu.network.switch.disabled": "#434c53",
"theme.bar.menus.menu.network.switch.puck": "#434c53", "theme.bar.menus.menu.network.switch.puck": "#434c53",
"theme.bar.buttons.systray.customIcon": "#d8dee9" "theme.bar.buttons.systray.customIcon": "#d8dee9",
"theme.bar.border.color": "#88c0d0"
} }

View File

@@ -341,5 +341,6 @@
"theme.bar.menus.menu.network.switch.puck": "#434c53", "theme.bar.menus.menu.network.switch.puck": "#434c53",
"theme.bar.menus.menu.network.switch.disabled": "#434c53", "theme.bar.menus.menu.network.switch.disabled": "#434c53",
"theme.bar.menus.menu.network.switch.enabled": "#88c0d0", "theme.bar.menus.menu.network.switch.enabled": "#88c0d0",
"theme.bar.buttons.systray.customIcon": "#d8dee9" "theme.bar.buttons.systray.customIcon": "#d8dee9",
"theme.bar.border.color": "#88c0d0"
} }

View File

@@ -341,5 +341,6 @@
"theme.bar.menus.menu.network.switch.enabled": "#c678dd", "theme.bar.menus.menu.network.switch.enabled": "#c678dd",
"theme.bar.menus.menu.network.switch.disabled": "#3e4451", "theme.bar.menus.menu.network.switch.disabled": "#3e4451",
"theme.bar.menus.menu.network.switch.puck": "#4b5263", "theme.bar.menus.menu.network.switch.puck": "#4b5263",
"theme.bar.buttons.systray.customIcon": "#abb2bf" "theme.bar.buttons.systray.customIcon": "#abb2bf",
"theme.bar.border.color": "#61afef"
} }

View File

@@ -341,5 +341,6 @@
"theme.bar.menus.menu.network.switch.enabled": "#c678dd", "theme.bar.menus.menu.network.switch.enabled": "#c678dd",
"theme.bar.menus.menu.network.switch.disabled": "#3e4451", "theme.bar.menus.menu.network.switch.disabled": "#3e4451",
"theme.bar.menus.menu.network.switch.puck": "#4b5263", "theme.bar.menus.menu.network.switch.puck": "#4b5263",
"theme.bar.buttons.systray.customIcon": "#abb2bf" "theme.bar.buttons.systray.customIcon": "#abb2bf",
"theme.bar.border.color": "#61afef"
} }

View File

@@ -341,5 +341,6 @@
"theme.bar.menus.menu.network.switch.puck": "#4b5263", "theme.bar.menus.menu.network.switch.puck": "#4b5263",
"theme.bar.menus.menu.network.switch.disabled": "#3e4451", "theme.bar.menus.menu.network.switch.disabled": "#3e4451",
"theme.bar.menus.menu.network.switch.enabled": "#c678dd", "theme.bar.menus.menu.network.switch.enabled": "#c678dd",
"theme.bar.buttons.systray.customIcon": "#abb2bf" "theme.bar.buttons.systray.customIcon": "#abb2bf",
"theme.bar.border.color": "#61afef"
} }

View File

@@ -341,5 +341,6 @@
"theme.bar.menus.menu.network.switch.enabled": "#c4a7e7", "theme.bar.menus.menu.network.switch.enabled": "#c4a7e7",
"theme.bar.menus.menu.network.switch.disabled": "#1f1d2e", "theme.bar.menus.menu.network.switch.disabled": "#1f1d2e",
"theme.bar.menus.menu.network.switch.puck": "#26233a", "theme.bar.menus.menu.network.switch.puck": "#26233a",
"theme.bar.buttons.systray.customIcon": "#e0def4" "theme.bar.buttons.systray.customIcon": "#e0def4",
"theme.bar.border.color": "#c4a7e7"
} }

View File

@@ -341,5 +341,6 @@
"theme.bar.menus.menu.network.switch.enabled": "#c4a7e7", "theme.bar.menus.menu.network.switch.enabled": "#c4a7e7",
"theme.bar.menus.menu.network.switch.disabled": "#2a273f", "theme.bar.menus.menu.network.switch.disabled": "#2a273f",
"theme.bar.menus.menu.network.switch.puck": "#393552", "theme.bar.menus.menu.network.switch.puck": "#393552",
"theme.bar.buttons.systray.customIcon": "#e0def4" "theme.bar.buttons.systray.customIcon": "#e0def4",
"theme.bar.border.color": "#c4a7e7"
} }

View File

@@ -341,5 +341,6 @@
"theme.bar.menus.menu.network.switch.enabled": "#c4a7e7", "theme.bar.menus.menu.network.switch.enabled": "#c4a7e7",
"theme.bar.menus.menu.network.switch.disabled": "#2a273f", "theme.bar.menus.menu.network.switch.disabled": "#2a273f",
"theme.bar.menus.menu.network.switch.puck": "#393552", "theme.bar.menus.menu.network.switch.puck": "#393552",
"theme.bar.buttons.systray.customIcon": "#e0def4" "theme.bar.buttons.systray.customIcon": "#e0def4",
"theme.bar.border.color": "#c4a7e7"
} }

View File

@@ -341,5 +341,6 @@
"theme.bar.menus.menu.network.switch.puck": "#393552", "theme.bar.menus.menu.network.switch.puck": "#393552",
"theme.bar.menus.menu.network.switch.disabled": "#2a273f", "theme.bar.menus.menu.network.switch.disabled": "#2a273f",
"theme.bar.menus.menu.network.switch.enabled": "#c4a7e7", "theme.bar.menus.menu.network.switch.enabled": "#c4a7e7",
"theme.bar.buttons.systray.customIcon": "#e0def4" "theme.bar.buttons.systray.customIcon": "#e0def4",
"theme.bar.border.color": "#c4a7e7"
} }

View File

@@ -341,5 +341,6 @@
"theme.bar.menus.menu.network.switch.enabled": "#c4a7e7", "theme.bar.menus.menu.network.switch.enabled": "#c4a7e7",
"theme.bar.menus.menu.network.switch.disabled": "#1f1d2e", "theme.bar.menus.menu.network.switch.disabled": "#1f1d2e",
"theme.bar.menus.menu.network.switch.puck": "#26233a", "theme.bar.menus.menu.network.switch.puck": "#26233a",
"theme.bar.buttons.systray.customIcon": "#e0def4" "theme.bar.buttons.systray.customIcon": "#e0def4",
"theme.bar.border.color": "#c4a7e7"
} }

View File

@@ -341,5 +341,6 @@
"theme.bar.menus.menu.network.switch.puck": "#26233a", "theme.bar.menus.menu.network.switch.puck": "#26233a",
"theme.bar.menus.menu.network.switch.disabled": "#1f1d2e", "theme.bar.menus.menu.network.switch.disabled": "#1f1d2e",
"theme.bar.menus.menu.network.switch.enabled": "#c4a7e7", "theme.bar.menus.menu.network.switch.enabled": "#c4a7e7",
"theme.bar.buttons.systray.customIcon": "#e0def4" "theme.bar.buttons.systray.customIcon": "#e0def4",
"theme.bar.border.color": "#c4a7e7"
} }

View File

@@ -341,5 +341,6 @@
"theme.bar.menus.menu.network.switch.enabled": "#bb9af7", "theme.bar.menus.menu.network.switch.enabled": "#bb9af7",
"theme.bar.menus.menu.network.switch.disabled": "#565f89", "theme.bar.menus.menu.network.switch.disabled": "#565f89",
"theme.bar.menus.menu.network.switch.puck": "#565f89", "theme.bar.menus.menu.network.switch.puck": "#565f89",
"theme.bar.buttons.systray.customIcon": "#c0caf5" "theme.bar.buttons.systray.customIcon": "#c0caf5",
"theme.bar.border.color": "#bb9af7"
} }

View File

@@ -341,5 +341,6 @@
"theme.bar.menus.menu.network.switch.enabled": "#bb9af7", "theme.bar.menus.menu.network.switch.enabled": "#bb9af7",
"theme.bar.menus.menu.network.switch.disabled": "#565f89", "theme.bar.menus.menu.network.switch.disabled": "#565f89",
"theme.bar.menus.menu.network.switch.puck": "#565f89", "theme.bar.menus.menu.network.switch.puck": "#565f89",
"theme.bar.buttons.systray.customIcon": "#c0caf5" "theme.bar.buttons.systray.customIcon": "#c0caf5",
"theme.bar.border.color": "#bb9af7"
} }

View File

@@ -341,5 +341,6 @@
"theme.bar.menus.menu.network.switch.puck": "#565f89", "theme.bar.menus.menu.network.switch.puck": "#565f89",
"theme.bar.menus.menu.network.switch.disabled": "#565f89", "theme.bar.menus.menu.network.switch.disabled": "#565f89",
"theme.bar.menus.menu.network.switch.enabled": "#bb9af7", "theme.bar.menus.menu.network.switch.enabled": "#bb9af7",
"theme.bar.buttons.systray.customIcon": "#c0caf5" "theme.bar.buttons.systray.customIcon": "#c0caf5",
"theme.bar.border.color": "#bb9af7"
} }

View File

@@ -54,10 +54,27 @@ export const BarSettings = (): Scrollable<Gtk.Widget, Gtk.Widget> => {
}), }),
/* /*
****************************** ******************************
* SPACING * * GENERAL *
****************************** ******************************
*/ */
Header('Spacing'), Header('General'),
Option({
opt: options.theme.bar.border.location,
title: 'Bar Border Location',
type: 'enum',
enums: ['none', 'full', 'top', 'right', 'bottom', 'left', 'horizontal', 'vertical'],
}),
Option({
opt: options.theme.bar.border.width,
title: 'Bar Border Width',
type: 'string',
}),
Option({
opt: options.theme.bar.border_radius,
title: 'Border Radius',
subtitle: 'Only applies if floating is enabled',
type: 'string',
}),
Option({ Option({
opt: options.theme.bar.outer_spacing, opt: options.theme.bar.outer_spacing,
title: 'Outer Spacing', title: 'Outer Spacing',
@@ -122,12 +139,6 @@ export const BarSettings = (): Scrollable<Gtk.Widget, Gtk.Widget> => {
subtitle: 'Only applies if floating is enabled', subtitle: 'Only applies if floating is enabled',
type: 'string', type: 'string',
}), }),
Option({
opt: options.theme.bar.border_radius,
title: 'Border Radius',
subtitle: 'Only applies if floating is enabled',
type: 'string',
}),
/* /*
****************************** ******************************

View File

@@ -33,6 +33,11 @@ export const BarTheme = (): Scrollable<Child, Attribute> => {
min: 0, min: 0,
max: 100, max: 100,
}), }),
Option({
opt: options.theme.bar.border.color,
title: 'Bar Border Color',
type: 'color',
}),
Option({ Option({
opt: options.theme.bar.buttons.opacity, opt: options.theme.bar.buttons.opacity,
title: 'Button Opacity', title: 'Button Opacity',