From 5d21b09b747a5b33401547d8b24b3cf9d312eb81 Mon Sep 17 00:00:00 2001 From: Daniel Napora Date: Fri, 1 Sep 2023 23:05:03 +0200 Subject: [PATCH] menu line height fixes --- bin/mb-jgtools | 25 +++++++++++++------------ mb-jgtools/pipemenu-standalone.cfg | 6 ++++-- 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/bin/mb-jgtools b/bin/mb-jgtools index e865eff..2c1895a 100755 --- a/bin/mb-jgtools +++ b/bin/mb-jgtools @@ -19,6 +19,8 @@ jgmenu_font="${menu_font_family} ${menu_font_size}" [[ -v menu_sep_font_family ]] && : || mb-setvar "menu_sep_font_family='Noto Sans Bold'" [[ -v menu_sep_font_size ]] && : || mb-setvar menu_sep_font_size=10 [[ -v item_height_factor ]] && : || mb-setvar item_height_factor=200 +[[ -v arrow_string ]] && : || mb-setvar "arrow_string=''" +[[ -v arrow_string_left ]] && : || mb-setvar "arrow_string_left=''" #menu title/sep font menu_sep_font_size=${menu_sep_font_size:-10} menu_sep_font_family=${menu_sep_font_family:-Noto Sans Bold} @@ -108,7 +110,7 @@ item_margin_x = ${item_margin_x:-0} item_margin_y = ${item_margin_y:-1} item_radius = ${item_radius:-2} item_border = ${item_border:-0} -arrow_string = ${ARROW_STRING:-⮞} +arrow_string = ${arrow_string:-} columns = ${COLUMNS:-1} menu_gradient_pos = ${menu_gradient_pos:-none} @@ -132,7 +134,7 @@ sep_halign = ${sep_halign:-center} sep_height = ${sep_height:-5} font = ${jgmenu_font:-Noto Sans Medium 9} -icon_size = $((icons*menu_font_size*item_height_factor/100-iconmargin)) +icon_size = $((icons*menu_font_size*item_height_factor/100)) icon_norm_alpha = 70 icon_sel_alpha = 100 @@ -310,7 +312,6 @@ trap "rm -f ${CONFIG_FILE} ${MENU_ITEMS} ${RHEAD}" EXIT #BOTTOM_IMG=${right_bottom_img:-/usr/share/mb-jgtools/mabox_3D_gold.png} MENU_HALIGN="right" ITEM_HALIGN="left" -ARROW_STRING=" ⮜ " JGWIDTH=40 TABS="100" MENU_PADDING_TOP=$((jgtools_padding + 70)) @@ -575,25 +576,25 @@ $HARDWARE,manjaro-settings-manager -m msm_mhwd,preferences-desktop-peripherals-d $ARANDR,arandr,monitor ^sep($SYSINFO_TITLE) $SYSINFO,^pipe(jgsysinfo-pipe),distributor-logo-linux -⮜ $BACK,^back() +${arrow_string_left} $BACK,^back() ^tag(mirrory) $FAST pacman-mirrors -f5,^term(sudo pacman-mirrors -f5;read -p "${FINISHED}") $ALL pacman-mirrors -i -c all,^term(sudo pacman-mirrors -i -c all;read -p "${FINISHED}") $GEOIP pacman-mirrors -i --geoip,^term(sudo pacman-mirrors -i --geoip;read -p "${FINISHED}") ^sep() -⮜ $BACK,^back() +${arrow_string_left} $BACK,^back() ^tag(msettings) . ~/.config/mabox/settings.csv ^sep() -⮜ $BACK,^back() +${arrow_string_left} $BACK,^back() . ~/.config/mabox/settings_tags.csv ^tag(userguide) $UGUIDE ^sep() -⮜ $BACK,^back() +${arrow_string_left} $BACK,^back() ^tag(weblinks) #^sep($ONLINE_RES) ^sep(Mabox Linux) @@ -631,7 +632,7 @@ Conky ArchWiki,xdg-open https://wiki.archlinux.org/index.php/Conky,conky #. $HOME/.config/mabox/online-resources.csv ^sep() -⮜ $BACK,^back() +${arrow_string_left} $BACK,^back() EOF @@ -1111,7 +1112,7 @@ cat < ${MENU_ITEMS}  $SEC10,scrot -d 10 $IMG -e $VIEW  $SEC15,scrot -d 15 $IMG -e $VIEW ^sep() - ⮜ $BACK,^back() + ${arrow_string_left} $BACK,^back() ^tag(window) ^sep($ACTIVE_WIN )  $NOW,scrot -d 1 -u -b $IMG -e $VIEW @@ -1119,7 +1120,7 @@ cat < ${MENU_ITEMS}  $SEC10,scrot -d 10 -u -b $IMG -e $VIEW  $SEC15,scrot -d 15 -u -b $IMG -e $VIEW ^sep() - ⮜ $BACK,^back() + ${arrow_string_left} $BACK,^back() ^tag(borderless) ^sep($ACTIVE_WIN_NO_DECOR)  $NOW,scrot -d 1 -u $IMG -e $VIEW @@ -1127,7 +1128,7 @@ cat < ${MENU_ITEMS}  $SEC10,scrot -d 10 -u $IMG -e $VIEW  $SEC15,scrot -d 15 -u $IMG -e $VIEW ^sep() - ⮜ $BACK,^back() + ${arrow_string_left} $BACK,^back() ^tag(selected) ^sep($SELECTED)  $NOW,"""maim -s -l -b 3 --color=0.3,0.4,0.6,0.4 ${IMG};viewnior ${IMG}""" @@ -1135,7 +1136,7 @@ cat < ${MENU_ITEMS}  $SEC10,"""maim -s -l --delay=10 -b 3 --color=0.3,0.4,0.6,0.4 ${IMG};viewnior ${IMG}"""  $SEC15,"""maim -s -l --delay=15 -b 3 --color=0.3,0.4,0.6,0.4 ${IMG};viewnior ${IMG}""" ^sep() - ⮜ $BACK,^back() + ${arrow_string_left} $BACK,^back() ^tag(settings) ^sep($SCROTSETTINGS) $EXTENSION [ ${EXT} ],^checkout(imgext) diff --git a/mb-jgtools/pipemenu-standalone.cfg b/mb-jgtools/pipemenu-standalone.cfg index f2c1a2a..4e59be4 100644 --- a/mb-jgtools/pipemenu-standalone.cfg +++ b/mb-jgtools/pipemenu-standalone.cfg @@ -47,7 +47,7 @@ item_margin_x = ${item_margin_x:-0} item_margin_y = ${item_margin_y:-1} item_radius = ${item_radius:-2} item_border = ${item_border:-0} -arrow_string = ${ARROW_STRING:-⮞} +arrow_string = ${arrow_string:-} columns = ${COLUMNS:-1} menu_gradient_pos = ${menu_gradient_pos:- none} @@ -70,7 +70,9 @@ sep_markup = font='${menu_sep_font:-${jgmenu_font}}' sep_halign = ${sep_halign:-center} sep_height = ${sep_height:-5} font = ${jgmenu_font:-Noto Sans Medium 9} -icon_size = $((icons*menu_font_size*item_height_factor/100-iconmargin)) +#icon_size = $((icons*menu_font_size*item_height_factor/100-iconmargin)) +#icon_size = $((icons*menu_font_size*2)) +icon_size = $((icons*menu_font_size*item_height_factor/100)) icon_norm_alpha = 70 icon_sel_alpha = 100 icon_text_spacing = ${iconmargin:-8}