From d48403d9c8d64216b3e8104401434ae024b5b0e6 Mon Sep 17 00:00:00 2001 From: matt1432 Date: Thu, 30 Nov 2023 14:13:01 -0500 Subject: [PATCH] feat(binto ags bar): make spacing consistent with hyprland --- devices/binto/config/ags/js/bar/main.js | 46 ++++++++++++------- .../binto/config/ags/scss/widgets/bar.scss | 2 - devices/binto/config/hypr/main.conf | 2 + 3 files changed, 31 insertions(+), 19 deletions(-) diff --git a/devices/binto/config/ags/js/bar/main.js b/devices/binto/config/ags/js/bar/main.js index 374b498..e13a67f 100644 --- a/devices/binto/config/ags/js/bar/main.js +++ b/devices/binto/config/ags/js/bar/main.js @@ -1,9 +1,13 @@ import { Box, CenterBox, Window } from 'resource:///com/github/Aylur/ags/widget.js'; import SysTray from 'file:///home/matt/.nix/devices/wim/config/ags/js/bar/buttons/systray.js'; +import Separator from 'file:///home/matt/.nix/devices/wim/config/ags/js/misc/separator.js'; import NotifButton from 'file:///home/matt/.nix/devices/wim/config/ags/js/bar/buttons/notif-button.js'; import Clock from './buttons/clock.js'; +const PADDING = 20; + + export default () => Window({ name: 'bar', layer: 'overlay', @@ -11,24 +15,32 @@ export default () => Window({ anchor: ['bottom', 'left', 'right'], monitor: 1, - child: CenterBox({ - start_widget: Box({ - hpack: 'start', - children: [ - SysTray(), - ], - }), + child: Box({ + vertical: true, + children: [ + CenterBox({ + start_widget: Box({ + hpack: 'start', + children: [ + Separator(PADDING), + SysTray(), + ], + }), - center_widget: Box({ - hpack: 'center', - }), + center_widget: Box({ + children: [], + }), - end_widget: Box({ - hpack: 'end', - children: [ - NotifButton(), - Clock(), - ], - }), + end_widget: Box({ + hpack: 'end', + children: [ + NotifButton(), + Clock(), + Separator(PADDING), + ], + }), + }), + Separator(PADDING, {vertical: true}), + ], }), }); diff --git a/devices/binto/config/ags/scss/widgets/bar.scss b/devices/binto/config/ags/scss/widgets/bar.scss index db03cf0..1276687 100644 --- a/devices/binto/config/ags/scss/widgets/bar.scss +++ b/devices/binto/config/ags/scss/widgets/bar.scss @@ -1,11 +1,9 @@ .clock, .notif-panel { - margin: 0 5px 5px 0; padding: 2.5px 5px; background-color: $bgfull; } .sys-tray { - margin: 0 0 5px 5px; menubar { background-color: $bgfull; diff --git a/devices/binto/config/hypr/main.conf b/devices/binto/config/hypr/main.conf index 1d61220..6afb616 100644 --- a/devices/binto/config/hypr/main.conf +++ b/devices/binto/config/hypr/main.conf @@ -35,5 +35,7 @@ windowrule = tile,^(firefox)$ # Cosmetic general { + gaps_in = 10 + gaps_out = 20 border_size = 0 }