diff --git a/bin/mb-jgtools b/bin/mb-jgtools index cb1a7c4..8d62474 100755 --- a/bin/mb-jgtools +++ b/bin/mb-jgtools @@ -1,4 +1,4 @@ -#!/bin/bash -l +#!/bin/bash # # mb-jgtools: Menu, Sidepanels, Screenshot Tool and Exit Dialog for Mabox # Copyright (C) 2019-2022 Daniel Napora @@ -9,6 +9,10 @@ item_height_factor=${item_height_factor:-200} menu_font_size=${menu_font_size:-9} menu_font_family=${menu_font_family:-Noto Sans Medium} jgmenu_font="${menu_font_family} ${menu_font_size}" +#menu title/sep font +menu_sep_font_size=${menu_sep_font_size:-9} +menu_sep_font_family=${menu_sep_font_family:-Noto Sans Bold} +menu_sep_font="${menu_sep_font_family} ${menu_sep_font_size}" [ $(pidof picom) ] && MENU_RADIUS=$jgtools_radius [ -z $jgmenu_use_borders ] && menu_border=0 @@ -96,8 +100,7 @@ color_title_border = ${color_title_border:-#169f6f 100} color_title_bg = ${color_title_bg:-#169f6f 100} color_scroll_ind = ${color_scroll_ind:-#504e65 100} -#sep_markup = weight='bold' -sep_markup = font='${menu_sep_font:-${jgmenu_font}}' weight='${menu_sep_font_weight:-bold}' style='${menu_sep_font_style:-normal}' +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} @@ -105,8 +108,8 @@ font = ${jgmenu_font:-Noto Sans Medium 9} icon_size = $((icons*menu_font_size*item_height_factor/100-iconmargin)) icon_norm_alpha = 70 icon_sel_alpha = 100 -#icon_text_spacing = $((menu_font_size*item_height_factor/400)) -icon_text_spacing = ${iconmargin:-6} + +icon_text_spacing = ${iconmargin:-8} icon_theme = ${jgmenu_icon_theme:-Numix-Square} EOF @@ -240,7 +243,7 @@ EOF fi -[[ "$jgmenu_use_icons" == "false" ]] && icons=0 iconmargin=0 || icons=1 iconmargin=6 +[[ "$jgmenu_use_icons" == "false" ]] && icons=0 iconmargin=0 || icons=1 iconmargin=8 mkconfigfile @@ -426,7 +429,7 @@ case $LANG in ;; esac -[ $jgmenu_use_icons == false ] && icons=0 iconmargin=0 || icons=1 iconmargin=6 +[ $jgmenu_use_icons == false ] && icons=0 iconmargin=0 || icons=1 iconmargin=8 mkconfigfile cat < ${MENU_ITEMS} @@ -735,7 +738,7 @@ JGWIDTH=$((jgtools_padding + 348 + jgtools_padding)) MENU_PADDING_TOP=$((jgtools_padding + 221)) TABS="250" icons=1 -iconmargin=6 +iconmargin=8 item_height_factor=300 #jgmenu_font="Noto Sans Medium 11" @@ -874,7 +877,7 @@ HIDE_BACK_ITEMS=1 MENU_PADDING_TOP=${jgtools_padding:-0} TABS="90" -[ $jgmenu_use_icons == false ] && icons=0 iconmargin=0 || icons=1 iconmargin=6 +[ $jgmenu_use_icons == false ] && icons=0 iconmargin=0 || icons=1 iconmargin=8 mkconfigfile diff --git a/mb-jgtools/pipemenu-standalone.cfg b/mb-jgtools/pipemenu-standalone.cfg index 6330809..69bf92e 100644 --- a/mb-jgtools/pipemenu-standalone.cfg +++ b/mb-jgtools/pipemenu-standalone.cfg @@ -4,6 +4,11 @@ item_height_factor=${item_height_factor:-200} menu_font_size=${menu_font_size:-9} menu_font_family=${menu_font_family:-Noto Sans Medium} jgmenu_font="${menu_font_family} ${menu_font_size}" +#menu title/sep font +menu_sep_font_size=${menu_sep_font_size:-9} +menu_sep_font_family=${menu_sep_font_family:-Noto Sans Bold} +menu_sep_font="${menu_sep_font_family} ${menu_sep_font_size}" + icons=${icons:-0} iconmargin=${iconmargin:-0} @@ -61,14 +66,14 @@ color_title_border = ${color_title_border:-#169f6f 100} color_title_bg = ${color_title_bg:-#262626 100} color_scroll_ind = ${COLOR_SCROLL_IND:-#504e65 100} -sep_markup = font='${menu_sep_font:-${jgmenu_font}}' weight='${menu_sep_font_weight:-bold}' style='${menu_sep_font_style:-normal}' +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_norm_alpha = 70 icon_sel_alpha = 100 -icon_text_spacing = $((menu_font_size*item_height_factor/400)) +icon_text_spacing = ${iconmargin:-8} icon_theme = ${jgmenu_icon_theme:-Numix-Square} EOF