master
Daniel Napora 2022-04-17 02:28:49 +02:00
parent 01e04e1855
commit d89e851470
2 changed files with 14 additions and 10 deletions

View File

@ -102,7 +102,7 @@ sep_halign = ${sep_halign:-center}
sep_height = ${sep_height:-5} sep_height = ${sep_height:-5}
font = ${jgmenu_font:-Noto Sans Medium 9} font = ${jgmenu_font:-Noto Sans Medium 9}
icon_size = $((menu_font_size*item_height_factor/100-2)) icon_size = $((icons*menu_font_size*item_height_factor/100-iconmargin))
icon_norm_alpha = 70 icon_norm_alpha = 70
icon_sel_alpha = 100 icon_sel_alpha = 100
icon_text_spacing = $((menu_font_size*item_height_factor/400)) icon_text_spacing = $((menu_font_size*item_height_factor/400))
@ -238,10 +238,11 @@ EOF
fi fi
[ $jgmenu_use_icons == false ] && jgmenu_icon_size=0
[ $jgmenu_use_icons == false ] && icons=0 iconmargin=0 || icons=1 iconmargin=4
mkconfigfile mkconfigfile
jgmenu --config-file=${CONFIG_FILE} 2>/dev/null jgmenu --config-file=${CONFIG_FILE} 2>/dev/null
} }
@ -424,7 +425,7 @@ case $LANG in
;; ;;
esac esac
[ $jgmenu_use_icons == false ] && icons=0 iconmargin=0 || icons=1 iconmargin=4
mkconfigfile mkconfigfile
cat <<EOF > ${MENU_ITEMS} cat <<EOF > ${MENU_ITEMS}
@ -634,7 +635,8 @@ else
fi fi
JGWIDTH=40 JGWIDTH=40
jgmenu_icon_size=0 icons=0
iconmargin=0
MENU_PADDING_TOP=$((jgtools_padding + 60)) MENU_PADDING_TOP=$((jgtools_padding + 60))
#BOTTOM_IMG=${places_bottom_img:-/usr/share/mb-jgtools/mabox_3D_silver.png} #BOTTOM_IMG=${places_bottom_img:-/usr/share/mb-jgtools/mabox_3D_silver.png}
#if [[ $places_softwarepipe || $places_sysinfopipe || $places_keyspipe ]];then pipeseparator="^sep($PIPEMENUS)";fi #if [[ $places_softwarepipe || $places_sysinfopipe || $places_keyspipe ]];then pipeseparator="^sep($PIPEMENUS)";fi
@ -731,8 +733,8 @@ jgtools_padding=${jgtools_padding:-0}
JGWIDTH=$((jgtools_padding + 348 + jgtools_padding)) JGWIDTH=$((jgtools_padding + 348 + jgtools_padding))
MENU_PADDING_TOP=$((jgtools_padding + 221)) MENU_PADDING_TOP=$((jgtools_padding + 221))
TABS="250" TABS="250"
jgmenu_item_height=30 icons=1
jgmenu_icon_size=26 iconmargin=4
#jgmenu_font="Noto Sans Medium 11" #jgmenu_font="Noto Sans Medium 11"
mkconfigfile mkconfigfile
@ -807,7 +809,8 @@ MENU_HALIGN="center"
MENU_VALIGN="center" MENU_VALIGN="center"
TABS="280" TABS="280"
jgmenu_item_height=28 jgmenu_item_height=28
jgmenu_icon_size=0 icons=0
iconmargin=0
#MENU_RADIUS=${RADIUS:-0} #MENU_RADIUS=${RADIUS:-0}
@ -869,8 +872,7 @@ HIDE_BACK_ITEMS=1
MENU_PADDING_TOP=${jgtools_padding:-0} MENU_PADDING_TOP=${jgtools_padding:-0}
TABS="90" TABS="90"
[ $jgmenu_use_icons == false ] && jgmenu_icon_size=0 [ $jgmenu_use_icons == false ] && icons=0 iconmargin=0 || icons=1 iconmargin=4
#jgmenu_icon_size=20
mkconfigfile mkconfigfile

View File

@ -4,6 +4,8 @@ item_height_factor=${item_height_factor:-200}
menu_font_size=${menu_font_size:-9} menu_font_size=${menu_font_size:-9}
menu_font_family=${menu_font_family:-Noto Sans Medium} menu_font_family=${menu_font_family:-Noto Sans Medium}
jgmenu_font="${menu_font_family} ${menu_font_size}" jgmenu_font="${menu_font_family} ${menu_font_size}"
icons=${icons:-0}
iconmargin=${iconmargin:-0}
mkconfigfile() { mkconfigfile() {
cat <<EOF > ${CONFIG_FILE} cat <<EOF > ${CONFIG_FILE}
@ -63,7 +65,7 @@ sep_markup = weight="bold"
sep_halign = ${sep_halign:-center} sep_halign = ${sep_halign:-center}
sep_height = ${sep_height:-5} sep_height = ${sep_height:-5}
font = ${jgmenu_font:-Noto Sans Medium 9} font = ${jgmenu_font:-Noto Sans Medium 9}
icon_size = $((menu_font_size*item_height_factor/100-2)) icon_size = $((icons*menu_font_size*item_height_factor/100-iconmargin))
icon_norm_alpha = 70 icon_norm_alpha = 70
icon_sel_alpha = 100 icon_sel_alpha = 100
icon_text_spacing = $((menu_font_size*item_height_factor/400)) icon_text_spacing = $((menu_font_size*item_height_factor/400))