diff --git a/bin/mb-jgtools b/bin/mb-jgtools index 67f6b84..cb1a7c4 100755 --- a/bin/mb-jgtools +++ b/bin/mb-jgtools @@ -74,7 +74,7 @@ item_halign = ${ITEM_HALIGN:-left} item_padding_x = 4 item_margin_x = ${item_margin_x:-0} -item_margin_y = ${item_margin_y:-2} +item_margin_y = ${item_margin_y:-1} item_radius = ${item_radius:-2} item_border = ${item_border:-0} arrow_string = ${ARROW_STRING:-⮞} @@ -96,8 +96,8 @@ 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="Ubuntu 16" weight="bold" +#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_halign = ${sep_halign:-center} sep_height = ${sep_height:-5} font = ${jgmenu_font:-Noto Sans Medium 9} @@ -105,7 +105,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 = $((menu_font_size*item_height_factor/400)) +icon_text_spacing = ${iconmargin:-6} icon_theme = ${jgmenu_icon_theme:-Numix-Square} EOF @@ -239,7 +240,7 @@ EOF fi -[ $jgmenu_use_icons == false ] && icons=0 iconmargin=0 || icons=1 iconmargin=4 +[[ "$jgmenu_use_icons" == "false" ]] && icons=0 iconmargin=0 || icons=1 iconmargin=6 mkconfigfile @@ -425,7 +426,7 @@ case $LANG in ;; esac -[ $jgmenu_use_icons == false ] && icons=0 iconmargin=0 || icons=1 iconmargin=4 +[ $jgmenu_use_icons == false ] && icons=0 iconmargin=0 || icons=1 iconmargin=6 mkconfigfile cat < ${MENU_ITEMS} @@ -734,7 +735,7 @@ JGWIDTH=$((jgtools_padding + 348 + jgtools_padding)) MENU_PADDING_TOP=$((jgtools_padding + 221)) TABS="250" icons=1 -iconmargin=4 +iconmargin=6 item_height_factor=300 #jgmenu_font="Noto Sans Medium 11" @@ -873,7 +874,7 @@ HIDE_BACK_ITEMS=1 MENU_PADDING_TOP=${jgtools_padding:-0} TABS="90" -[ $jgmenu_use_icons == false ] && icons=0 iconmargin=0 || icons=1 iconmargin=4 +[ $jgmenu_use_icons == false ] && icons=0 iconmargin=0 || icons=1 iconmargin=6 mkconfigfile diff --git a/mb-jgtools/pipemenu-standalone.cfg b/mb-jgtools/pipemenu-standalone.cfg index c0f8293..6330809 100644 --- a/mb-jgtools/pipemenu-standalone.cfg +++ b/mb-jgtools/pipemenu-standalone.cfg @@ -39,7 +39,7 @@ item_halign = ${ITEM_HALIGN:-left} item_padding_x = 4 item_margin_x = ${item_margin_x:-0} -item_margin_y = ${item_margin_y:-3} +item_margin_y = ${item_margin_y:-1} item_radius = ${item_radius:-2} item_border = ${item_border:-0} arrow_string = ${ARROW_STRING:-⮞} @@ -61,7 +61,7 @@ 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 = weight="bold" +sep_markup = font='${menu_sep_font:-${jgmenu_font}}' weight='${menu_sep_font_weight:-bold}' style='${menu_sep_font_style:-normal}' sep_halign = ${sep_halign:-center} sep_height = ${sep_height:-5} font = ${jgmenu_font:-Noto Sans Medium 9}