From e195cd5c02fd3439175d3163e134fbff67ab9264 Mon Sep 17 00:00:00 2001 From: Daniel Napora Date: Tue, 1 Jun 2021 13:38:06 +0200 Subject: [PATCH] most of pipemenus obey vertical alignment now --- usr/bin/jgconky-pipe | 11 ++++++++++- usr/bin/jgdeskgrid | 11 +++++++++-- usr/bin/jgdeskmngr | 18 +++++++++++------- usr/bin/jgdesktops | 12 ++++++++++-- usr/bin/jgmenusettings-pipe | 10 +++++++++- usr/bin/jgssh | 11 ++++++++++- usr/bin/jgtint2-pipe | 11 ++++++++++- usr/bin/jgwallpaperchanger | 10 +++++++++- 8 files changed, 78 insertions(+), 16 deletions(-) diff --git a/usr/bin/jgconky-pipe b/usr/bin/jgconky-pipe index 472b086..1beed40 100755 --- a/usr/bin/jgconky-pipe +++ b/usr/bin/jgconky-pipe @@ -134,9 +134,18 @@ out+=("^sep($SESSIONS_LBL)") if [ $1 == "-s" ]; then . /usr/bin/pipemenu-standalone.cfg . $HOME/.config/mabox/mabox.conf + +if [[ $panels_heightpos == "top" ]]; then +MENU_VALIGN="top" +MENU_MARGIN_Y=${panels_topmargin:-0} +elif [[ $panels_heightpos == "bottom" ]]; then +MENU_VALIGN="bottom" +MENU_MARGIN_Y=${panels_topmargin:-0} +else + MENU_VALIGN="center" +fi MENU_PADDING_TOP=${jgtools_padding:-0} MENU_HALIGN="left" -MENU_VALIGN="center" MENU_MARGIN_Y=40 jgmenu_icon_size=0 menu_margin_x=${submenu_spacing:-0} diff --git a/usr/bin/jgdeskgrid b/usr/bin/jgdeskgrid index 377ee84..5920f22 100755 --- a/usr/bin/jgdeskgrid +++ b/usr/bin/jgdeskgrid @@ -105,10 +105,17 @@ out2+=("$(printf "%3s,%s" "false" "mb-setvar notifications=false $CONFI if [[ "$1" == "-s" ]]; then . /usr/bin/pipemenu-standalone.cfg . $HOME/.config/mabox/mabox.conf - +if [[ $panels_heightpos == "top" ]]; then +MENU_VALIGN="top" +MENU_MARGIN_Y=${panels_topmargin:-0} +elif [[ $panels_heightpos == "bottom" ]]; then +MENU_VALIGN="bottom" +MENU_MARGIN_Y=${panels_topmargin:-0} +else + MENU_VALIGN="center" +fi MENU_PADDING_TOP=${jgtools_padding:-0} MENU_HALIGN="left" -MENU_VALIGN="center" jgmenu_icon_size=0 JGWIDTH=40 menu_margin_x=${submenu_spacing:-0} diff --git a/usr/bin/jgdeskmngr b/usr/bin/jgdeskmngr index 45497d0..4e72132 100755 --- a/usr/bin/jgdeskmngr +++ b/usr/bin/jgdeskmngr @@ -47,12 +47,9 @@ case $LANG in ;; esac - SESSIONDIR="$HOME/.config/deskmngr/" mkdir -p $SESSIONDIR - - out+=("^sep($DESKMNGR)") out+=("$ABOUT,\"\"\"notify-send.sh -u critical -i mbcc '$title' '$help'\"\"\"") out+=("^sep($SAVED_SESS)") @@ -82,12 +79,19 @@ out+=("  $NEW,deskmngr -s") if [ $1 == "-s" ]; then . /usr/bin/pipemenu-standalone.cfg . $HOME/.config/mabox/mabox.conf - +if [[ $panels_heightpos == "top" ]]; then +MENU_VALIGN="top" +MENU_MARGIN_Y=${panels_topmargin:-0} +elif [[ $panels_heightpos == "bottom" ]]; then +MENU_VALIGN="bottom" +MENU_MARGIN_Y=${panels_topmargin:-0} +else + MENU_VALIGN="center" +fi MENU_PADDING_TOP=${jgtools_padding:-0} -MENU_HALIGN="center" -MENU_VALIGN="center" +MENU_HALIGN="left" jgmenu_icon_size=0 - +menu_margin_x=${submenu_spacing:-0} [ $(pidof picom) ] && MENU_RADIUS=$jgtools_radius [ -z $jgmenu_use_borders ] && menu_border=0 diff --git a/usr/bin/jgdesktops b/usr/bin/jgdesktops index c8cd3dd..2e11aff 100755 --- a/usr/bin/jgdesktops +++ b/usr/bin/jgdesktops @@ -98,11 +98,19 @@ out+=("$DESKMNGR,jgdeskmngr -s") if [[ $1 == "-s" ]]; then . /usr/bin/pipemenu-standalone.cfg . $HOME/.config/mabox/mabox.conf - +if [[ $panels_heightpos == "top" ]]; then +MENU_VALIGN="top" +MENU_MARGIN_Y=${panels_topmargin:-0} +elif [[ $panels_heightpos == "bottom" ]]; then +MENU_VALIGN="bottom" +MENU_MARGIN_Y=${panels_topmargin:-0} +else + MENU_VALIGN="center" +fi MENU_PADDING_TOP=${jgtools_padding:-0} MENU_HALIGN="center" -MENU_VALIGN="center" + jgmenu_icon_size=0 [ $(pidof picom) ] && MENU_RADIUS=$jgtools_radius diff --git a/usr/bin/jgmenusettings-pipe b/usr/bin/jgmenusettings-pipe index 08a25bc..9c11c22 100755 --- a/usr/bin/jgmenusettings-pipe +++ b/usr/bin/jgmenusettings-pipe @@ -399,10 +399,18 @@ fi if [[ $1 == "-s" ]]; then . /usr/bin/pipemenu-standalone.cfg +if [[ $panels_heightpos == "top" ]]; then +MENU_VALIGN="top" +MENU_MARGIN_Y=${panels_topmargin:-0} +elif [[ $panels_heightpos == "bottom" ]]; then +MENU_VALIGN="bottom" +MENU_MARGIN_Y=${panels_topmargin:-0} +else + MENU_VALIGN="center" +fi MENU_PADDING_TOP=${jgtools_padding} MENU_HALIGN="left" -MENU_VALIGN="center" jgmenu_icon_size=0 JGWIDTH=40 menu_margin_x=${submenu_spacing:-0} diff --git a/usr/bin/jgssh b/usr/bin/jgssh index 8071761..bfdc805 100755 --- a/usr/bin/jgssh +++ b/usr/bin/jgssh @@ -63,9 +63,18 @@ __standalone() { __mklist . /usr/bin/pipemenu-standalone.cfg . $HOME/.config/mabox/mabox.conf + +if [[ $panels_heightpos == "top" ]]; then +MENU_VALIGN="top" +MENU_MARGIN_Y=${panels_topmargin:-0} +elif [[ $panels_heightpos == "bottom" ]]; then +MENU_VALIGN="bottom" +MENU_MARGIN_Y=${panels_topmargin:-0} +else + MENU_VALIGN="center" +fi MENU_PADDING_TOP=${jgtools_padding:-0} MENU_HALIGN="left" -MENU_VALIGN="center" MENU_MARGIN_Y=40 jgmenu_icon_size=0 menu_margin_x=${submenu_spacing:-0} diff --git a/usr/bin/jgtint2-pipe b/usr/bin/jgtint2-pipe index b672036..c4d754c 100755 --- a/usr/bin/jgtint2-pipe +++ b/usr/bin/jgtint2-pipe @@ -107,9 +107,18 @@ fi if [ $1 == "-s" ]; then . /usr/bin/pipemenu-standalone.cfg . $HOME/.config/mabox/mabox.conf +if [[ $panels_heightpos == "top" ]]; then +MENU_VALIGN="top" +MENU_MARGIN_Y=${panels_topmargin:-0} +elif [[ $panels_heightpos == "bottom" ]]; then +MENU_VALIGN="bottom" +MENU_MARGIN_Y=${panels_topmargin:-0} +else + MENU_VALIGN="center" +fi + MENU_PADDING_TOP=${jgtools_padding:-0} MENU_HALIGN="left" -MENU_VALIGN="center" MENU_MARGIN_Y=40 jgmenu_icon_size=0 menu_margin_x=${submenu_spacing:-0} diff --git a/usr/bin/jgwallpaperchanger b/usr/bin/jgwallpaperchanger index 871dd8b..6a0ebef 100755 --- a/usr/bin/jgwallpaperchanger +++ b/usr/bin/jgwallpaperchanger @@ -120,9 +120,17 @@ if [[ "$1" == "-s" ]]; then . /usr/bin/pipemenu-standalone.cfg . $HOME/.config/mabox/mabox.conf +if [[ $panels_heightpos == "top" ]]; then +MENU_VALIGN="top" +MENU_MARGIN_Y=${panels_topmargin:-0} +elif [[ $panels_heightpos == "bottom" ]]; then +MENU_VALIGN="bottom" +MENU_MARGIN_Y=${panels_topmargin:-0} +else + MENU_VALIGN="center" +fi MENU_PADDING_TOP=${jgtools_padding:-0} MENU_HALIGN="left" -MENU_VALIGN="center" jgmenu_icon_size=0 JGWIDTH=40 menu_margin_x=${submenu_spacing:-0}