XorA
/
bash-it
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adds soft-separator suport to powerline themes

pull/1445/head
David Farrell 2019-11-01 10:38:34 -07:00
parent 6c64ba26f1
commit 349c1df556
No known key found for this signature in database
GPG Key ID: 1CCA28D0E300B56F
4 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
themes/powerline-multiline/powerline-multiline.base.bash
View File

@ -9,6 +9,7 @@ function __powerline_right_segment {
local params=( $1 ) local params=( $1 )
IFS="${OLD_IFS}" IFS="${OLD_IFS}"
local separator_char="${POWERLINE_RIGHT_SEPARATOR}" local separator_char="${POWERLINE_RIGHT_SEPARATOR}"
local separator_char_soft="${POWERLINE_RIGHT_SEPARATOR_SOFT}"
local padding="${POWERLINE_PADDING}" local padding="${POWERLINE_PADDING}"
local separator_color="" local separator_color=""
@ -16,7 +17,12 @@ function __powerline_right_segment {
separator_char="${POWERLINE_RIGHT_END}" separator_char="${POWERLINE_RIGHT_END}"
separator_color="$(set_color ${params[1]} -)" separator_color="$(set_color ${params[1]} -)"
else else
separator_color="$(set_color ${params[1]} ${LAST_SEGMENT_COLOR})" if [[ "${LAST_SEGMENT_COLOR}" -eq "${params[1]}" ]]; then
separator_color="$(set_color - ${LAST_SEGMENT_COLOR})"
separator_char=${separator_char_soft}
else
separator_color="$(set_color ${params[1]} ${LAST_SEGMENT_COLOR})"
fi
(( padding += 1 )) (( padding += 1 ))
fi fi
RIGHT_PROMPT+="${separator_color}${separator_char}${normal}$(set_color - ${params[1]}) ${params[0]} ${normal}$(set_color - ${COLOR})${normal}" RIGHT_PROMPT+="${separator_color}${separator_char}${normal}$(set_color - ${params[1]}) ${params[0]} ${normal}$(set_color - ${COLOR})${normal}"

2
themes/powerline-multiline/powerline-multiline.theme.bash
View File

@ -5,7 +5,9 @@
PROMPT_CHAR=${POWERLINE_PROMPT_CHAR:="❯"} PROMPT_CHAR=${POWERLINE_PROMPT_CHAR:="❯"}
POWERLINE_LEFT_SEPARATOR=${POWERLINE_LEFT_SEPARATOR:=""} POWERLINE_LEFT_SEPARATOR=${POWERLINE_LEFT_SEPARATOR:=""}
POWERLINE_LEFT_SEPARATOR_SOFT=${POWERLINE_LEFT_SEPARATOR_SOFT:=""}
POWERLINE_RIGHT_SEPARATOR=${POWERLINE_RIGHT_SEPARATOR:=""} POWERLINE_RIGHT_SEPARATOR=${POWERLINE_RIGHT_SEPARATOR:=""}
POWERLINE_RIGHT_SEPARATOR_SOFT=${POWERLINE_RIGHT_SEPARATOR_SOFT:=""}
POWERLINE_LEFT_END=${POWERLINE_LEFT_END:=""} POWERLINE_LEFT_END=${POWERLINE_LEFT_END:=""}
POWERLINE_RIGHT_END=${POWERLINE_RIGHT_END:=""} POWERLINE_RIGHT_END=${POWERLINE_RIGHT_END:=""}
POWERLINE_PADDING=${POWERLINE_PADDING:=2} POWERLINE_PADDING=${POWERLINE_PADDING:=2}

7
themes/powerline/powerline.base.bash
View File

@ -159,10 +159,15 @@ function __powerline_left_segment {
local params=( $1 ) local params=( $1 )
IFS="${OLD_IFS}" IFS="${OLD_IFS}"
local separator_char="${POWERLINE_LEFT_SEPARATOR}" local separator_char="${POWERLINE_LEFT_SEPARATOR}"
local separator_char_soft="${POWERLINE_LEFT_SEPARATOR_SOFT}"
local separator="" local separator=""
if [[ "${SEGMENTS_AT_LEFT}" -gt 0 ]]; then if [[ "${SEGMENTS_AT_LEFT}" -gt 0 ]]; then
separator="$(set_color ${LAST_SEGMENT_COLOR} ${params[1]})${separator_char}${normal}" if [[ "${LAST_SEGMENT_COLOR}" -eq "${params[1]}" ]]; then
separator="$(set_color - ${LAST_SEGMENT_COLOR})${separator_char_soft}${normal}"
else
separator="$(set_color ${LAST_SEGMENT_COLOR} ${params[1]})${separator_char}${normal}"
fi
fi fi
LEFT_PROMPT+="${separator}$(set_color - ${params[1]}) ${params[0]} ${normal}" LEFT_PROMPT+="${separator}$(set_color - ${params[1]}) ${params[0]} ${normal}"
LAST_SEGMENT_COLOR=${params[1]} LAST_SEGMENT_COLOR=${params[1]}

1
themes/powerline/powerline.theme.bash
View File

@ -4,6 +4,7 @@
PROMPT_CHAR=${POWERLINE_PROMPT_CHAR:=""} PROMPT_CHAR=${POWERLINE_PROMPT_CHAR:=""}
POWERLINE_LEFT_SEPARATOR=${POWERLINE_LEFT_SEPARATOR:=""} POWERLINE_LEFT_SEPARATOR=${POWERLINE_LEFT_SEPARATOR:=""}
POWERLINE_LEFT_SEPARATOR_SOFT=${POWERLINE_LEFT_SEPARATOR_SOFT:=""}
USER_INFO_SSH_CHAR=${POWERLINE_USER_INFO_SSH_CHAR:=" "} USER_INFO_SSH_CHAR=${POWERLINE_USER_INFO_SSH_CHAR:=" "}
USER_INFO_THEME_PROMPT_COLOR=32 USER_INFO_THEME_PROMPT_COLOR=32