From fa12ae1e8b1fabf192b8ba708d3ae9620b80acf9 Mon Sep 17 00:00:00 2001 From: Daniel Napora Date: Sun, 16 Feb 2020 01:51:13 +0100 Subject: [PATCH] fix sep_markup with default theme --- bin/mb-jgtools | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/bin/mb-jgtools b/bin/mb-jgtools index f717785..e674269 100755 --- a/bin/mb-jgtools +++ b/bin/mb-jgtools @@ -4,7 +4,9 @@ #JGTHEME=${jgmenu_theme:-default} case $jgmenu_theme in - default) ;; + default) + export color_norm_fg="#FFFFFF" + ;; obtheme) ob_file=$HOME/.config/openbox/rc.xml [[ -f $ob_file ]] && wm_theme=$(awk '// {while (getline n) {if (match(n, //)){l=n; exit}}} END {split(l, a, "[<>]"); print a[3]}' "$ob_file") @@ -13,7 +15,9 @@ case $jgmenu_theme in [[ -n "$a" && "$a" != [[:blank:]#]* ]] && export "$a$b$c";echo "$a$b$c" done < $HOME/.config/mabox/jgobthemes/$wm_theme.colorrc ;; - *) ;; + *) + export color_norm_fg="#FFFFF" + ;; esac echo "BG$color_menu_bg" # jgmenu_use-icons= @@ -81,10 +85,6 @@ arrow_string = ${ARROW_STRING:-⮞} columns = ${COLUMNS:-1} -sep_markup = weight="bold" foreground="${color_norm_fg% *}" -font = ${font:-Noto Sans Medium 9} -icon_size = ${ICON_SIZE:-0} - color_menu_bg = ${color_menu_bg:-#222222 80} color_menu_border = ${COLOR_MENU_BORDER:-#2f9b85 100} color_norm_bg = ${color_norm_bg:-#000000 0} @@ -95,6 +95,10 @@ color_sel_border = ${color_sel_border:-#504e65 100} color_sep_fg = ${color_sep_fg:-#4D4D4D 100} color_sep_bg = ${color_sep_bg:-#262626 100} color_scroll_ind = ${COLOR_SCROLL_IND:-#504e65 100} + +sep_markup = weight="bold" foreground="${color_norm_fg% *}" +font = ${font:-Noto Sans Medium 9} +icon_size = ${ICON_SIZE:-0} EOF } @@ -249,7 +253,7 @@ mkconfigfile cat < ${MENU_ITEMS} @icon,,10,10,48,48,4,left,top,,,/usr/share/icons/hicolor/48x48/apps/mbcc.png -#@icon,,40,$(expr $MENU_HEIGHT_MIN - 96),143,96,4,left,top,,,/home/napcok/.config/mabox/tux.svg +@icon,,40,$(expr $MENU_HEIGHT_MIN - 96),143,96,4,left,top,,,$HOME/.config/mabox/tux.svg @text,,70,10,200,20,4,left,top,${color_norm_fg% *},#111111,$OSNAME $OSVERSION $OSCODE @text,,70,30,200,20,4,left,top,#666666,#444444,$USER@$HOSTNAME @text,,70,50,200,20,4,left,top,#666666,#444444,