diff --git a/bin/mb-jgtools b/bin/mb-jgtools index 8f057ec..781876c 100755 --- a/bin/mb-jgtools +++ b/bin/mb-jgtools @@ -4,7 +4,8 @@ # Copyright (C) 2019-2021 Daniel Napora #mb-setvar jgtools_last="\"$*\"" . $HOME/.config/mabox/mabox.conf - +unset font +unset menu_gradient_pos jgmenu_theme=${jgmenu_theme:-obtheme} case $jgmenu_theme in @@ -105,7 +106,7 @@ arrow_string = ${ARROW_STRING:-⮞} columns = ${COLUMNS:-1} -menu_gradient_pos = ${menu_gradient_pos:- none} +menu_gradient_pos = ${menu_gradient_pos:-none} color_menu_bg = ${color_menu_bg:-#222222 80} color_menu_bg_to = ${color_menu_bg_to:- #000000 100} color_menu_border = ${color_menu_border:-#2f9b85 100} @@ -123,6 +124,7 @@ color_scroll_ind = ${COLOR_SCROLL_IND:-#504e65 100} sep_markup = weight="bold" foreground="${color_title_fg% *}" + sep_height = ${sep_height:-5} font = ${jgmenu_font:-Noto Sans Medium 9} icon_size = ${jgmenu_icon_size:-16} @@ -130,6 +132,7 @@ icon_theme = ${jgmenu_icon_theme:-Numix-Square} EOF unset font +unset menu_gradient_pos } #MENU GŁÓWNE @@ -167,10 +170,10 @@ ITEM_HALIGN="left" ARROW_STRING=" ⮜ " JGWIDTH=40 TABS="100" -#MENU_HEIGHT_MIN=$(xdpyinfo | awk '/^ +dimensions/ {print $2}' | cut -d 'x' -f2) -##experyment -SCRHEIGHT=$(xdpyinfo | awk '/^ +dimensions/ {print $2}' | cut -d 'x' -f2) -MENU_HEIGHT_MIN=$(expr $SCRHEIGHT - $panels_topmargin - $panels_topmargin) + +panels_topmargin=${panels_topmargin:-0} +eval $(xdotool getdisplaygeometry --shell) +MENU_HEIGHT_MIN=$(expr $HEIGHT - $panels_topmargin - $panels_topmargin) MENU_HEIGHT_MAX=$MENU_HEIGHT_MIN case $LANG in @@ -321,11 +324,11 @@ esac mkconfigfile cat < ${MENU_ITEMS} -@icon,,15,10,48,48,4,left,top,,,/usr/share/icons/hicolor/48x48/apps/distributor-logo-mabox.png -@text,,70,10,200,20,4,left,top,${color_sel_fg% *},#111111,$OSNAME $OSVERSION $OSCODE -@text,,70,30,200,20,4,left,top,${color_norm_fg% *},#444444,$USER@$HOSTNAME +@icon,,10,10,48,48,4,left,top,,,/usr/share/icons/hicolor/48x48/apps/distributor-logo-mabox.png +@text,,65,10,200,20,4,left,top,${color_sel_fg% *},#111111,$OSNAME $OSVERSION $OSCODE +@text,,65,30,200,20,4,left,top,${color_norm_fg% *},#444444,$USER@$HOSTNAME @icon,,5,$(expr $MENU_HEIGHT_MIN - 180),240,180,4,center,top,,,$BOTTOM_IMG -@search,,100,50,292,20,4,left,top,auto,#262626,""" $TYPE_TO_SEARCH""" +@search,,80,50,292,20,4,left,top,auto,#262626,""" $TYPE_TO_SEARCH""" . $HOME/.config/mabox/right-prepend.csv