1
0
Fork 0
mirror of https://github.com/romkatv/powerlevel10k.git synced 2024-11-22 12:20:07 +00:00

In case that two subsequent segments have the same background color, now a small separator is displayed. Before this commit, no segment separator was shown and the two segments looked like one.

This commit is contained in:
Dominik Ritter 2015-09-04 18:30:04 +02:00
parent 6e4d24f50d
commit 9191d29c96

View file

@ -75,6 +75,8 @@ case $POWERLEVEL9K_MODE in
icons=( icons=(
LEFT_SEGMENT_SEPARATOR "\UE0B0" #  LEFT_SEGMENT_SEPARATOR "\UE0B0" # 
RIGHT_SEGMENT_SEPARATOR "\UE0B2" #  RIGHT_SEGMENT_SEPARATOR "\UE0B2" # 
LEFT_SUBSEGMENT_SEPARATOR "\UE0B1" # 
RIGHT_SUBSEGMENT_SEPARATOR "\UE0B3" # 
ROOT_ICON "\UE801" #  ROOT_ICON "\UE801" # 
RUBY_ICON "\UE847" #  RUBY_ICON "\UE847" # 
AWS_ICON "\UE895" #  AWS_ICON "\UE895" # 
@ -116,6 +118,8 @@ case $POWERLEVEL9K_MODE in
icons=( icons=(
LEFT_SEGMENT_SEPARATOR "\uE0B0" #  LEFT_SEGMENT_SEPARATOR "\uE0B0" # 
RIGHT_SEGMENT_SEPARATOR "\uE0B2" #  RIGHT_SEGMENT_SEPARATOR "\uE0B2" # 
LEFT_SUBSEGMENT_SEPARATOR "\UE0B1" # 
RIGHT_SUBSEGMENT_SEPARATOR "\UE0B3" # 
ROOT_ICON "\u26A1" # ⚡ ROOT_ICON "\u26A1" # ⚡
RUBY_ICON '' RUBY_ICON ''
AWS_ICON "AWS:" AWS_ICON "AWS:"
@ -313,6 +317,14 @@ left_prompt_segment() {
if [[ $CURRENT_BG != 'NONE' && $2 != $CURRENT_BG ]]; then if [[ $CURRENT_BG != 'NONE' && $2 != $CURRENT_BG ]]; then
# Middle segment # Middle segment
echo -n "%{$bg%F{$CURRENT_BG}%}$(print_icon 'LEFT_SEGMENT_SEPARATOR')%{$fg%} " echo -n "%{$bg%F{$CURRENT_BG}%}$(print_icon 'LEFT_SEGMENT_SEPARATOR')%{$fg%} "
elif [[ "$CURRENT_BG" == $2 ]]; then
# Middle segment with same color as previous segment
# We take the current foreground color as color for our
# subsegment (or the default color). This should have
# enough contrast.
local complement
[[ -n $3 ]] && complement=$3 || complement=$DEFAULT_COLOR
echo -n "%{$bg%F{$complement}%}$(print_icon 'LEFT_SUBSEGMENT_SEPARATOR')%{$fg%} "
else else
# First segment # First segment
echo -n "%{$bg%}%{$fg%} " echo -n "%{$bg%}%{$fg%} "
@ -332,6 +344,8 @@ left_prompt_end() {
CURRENT_BG='' CURRENT_BG=''
} }
CURRENT_RIGHT_BG='NONE'
# Begin a right prompt segment # Begin a right prompt segment
# Takes four arguments: # Takes four arguments:
# * $1: Name of the function that was orginally invoked (mandatory). # * $1: Name of the function that was orginally invoked (mandatory).
@ -354,8 +368,21 @@ right_prompt_segment() {
local bg fg local bg fg
[[ -n $2 ]] && bg="%K{$2}" || bg="%k" [[ -n $2 ]] && bg="%K{$2}" || bg="%k"
[[ -n $3 ]] && fg="%F{$3}" || fg="%f" [[ -n $3 ]] && fg="%F{$3}" || fg="%f"
if [[ "$CURRENT_RIGHT_BG" == $2 ]]; then
# Middle segment with same color as previous segment
# We take the current foreground color as color for our
# subsegment (or the default color). This should have
# enough contrast.
local complement
[[ -n $3 ]] && complement=$3 || complement=$DEFAULT_COLOR
echo -n "%f%F{$complement}$(print_icon 'RIGHT_SUBSEGMENT_SEPARATOR')%f%{$bg%}%{$fg%} "
else
echo -n "%f%F{$2}$(print_icon 'RIGHT_SEGMENT_SEPARATOR')%f%{$bg%}%{$fg%} " echo -n "%f%F{$2}$(print_icon 'RIGHT_SEGMENT_SEPARATOR')%f%{$bg%}%{$fg%} "
fi
[[ -n $4 ]] && echo -n "$4 " [[ -n $4 ]] && echo -n "$4 "
CURRENT_RIGHT_BG=$2
} }
################################################################ ################################################################