mirror of
https://github.com/romkatv/powerlevel10k.git
synced 2024-11-16 17:50:09 +00:00
add an option for right frame without left
This commit is contained in:
parent
29b9397fa9
commit
a2a21ae95a
2 changed files with 33 additions and 20 deletions
|
@ -1,5 +1,5 @@
|
||||||
typeset -gr __p9k_wizard_columns=70
|
typeset -gr __p9k_wizard_columns=70
|
||||||
typeset -gr __p9k_wizard_lines=25
|
typeset -gr __p9k_wizard_lines=27
|
||||||
typeset -gr __p9k_zd=${${ZDOTDIR:-$HOME}:A}
|
typeset -gr __p9k_zd=${${ZDOTDIR:-$HOME}:A}
|
||||||
typeset -gr __p9k_zd_u=${${(q-)__p9k_zd}/#(#b)$HOME(|\/*)/'~'$match[1]}
|
typeset -gr __p9k_zd_u=${${(q-)__p9k_zd}/#(#b)$HOME(|\/*)/'~'$match[1]}
|
||||||
typeset -gr __p9k_cfg_basename=.p10k.zsh
|
typeset -gr __p9k_cfg_basename=.p10k.zsh
|
||||||
|
|
|
@ -86,8 +86,8 @@ function print_prompt() {
|
||||||
left=($left[2] $left[4])
|
left=($left[2] $left[4])
|
||||||
right=($right[1] $right[3])
|
right=($right[1] $right[3])
|
||||||
else
|
else
|
||||||
(( frame < 1 )) && left=('' $left[2] '' '%76F❯%f █')
|
(( left_frame )) || left=('' $left[2] '' '%76F❯%f █')
|
||||||
(( frame < 2 )) && right=($right[1] '' '' '')
|
(( right_frame )) || right=($right[1] '' '' '')
|
||||||
fi
|
fi
|
||||||
if (( straight )); then
|
if (( straight )); then
|
||||||
[[ $POWERLEVEL9K_MODE == nerdfont-complete ]] && local subsep='\uE0BD' || local subsep='|'
|
[[ $POWERLEVEL9K_MODE == nerdfont-complete ]] && local subsep='\uE0BD' || local subsep='|'
|
||||||
|
@ -511,7 +511,8 @@ function ask_gap_char() {
|
||||||
|
|
||||||
function ask_frame() {
|
function ask_frame() {
|
||||||
if [[ $style != classic || $num_lines != 2 ]]; then
|
if [[ $style != classic || $num_lines != 2 ]]; then
|
||||||
frame=0
|
left_frame=1
|
||||||
|
right_frame=1
|
||||||
return
|
return
|
||||||
fi
|
fi
|
||||||
while true; do
|
while true; do
|
||||||
|
@ -520,15 +521,19 @@ function ask_frame() {
|
||||||
print -P ""
|
print -P ""
|
||||||
print -P "%B(1) No frame.%b"
|
print -P "%B(1) No frame.%b"
|
||||||
print -P ""
|
print -P ""
|
||||||
frame=0 print_prompt
|
left_frame=0 right_frame=0 print_prompt
|
||||||
print -P ""
|
print -P ""
|
||||||
print -P "%B(2) Only left.%b"
|
print -P "%B(2) Only left.%b"
|
||||||
print -P ""
|
print -P ""
|
||||||
frame=1 print_prompt
|
left_frame=1 right_frame=0 print_prompt
|
||||||
print -P ""
|
print -P ""
|
||||||
print -P "%B(3) Left and right.%b"
|
print -P "%B(3) Only right.%b"
|
||||||
print -P ""
|
print -P ""
|
||||||
frame=2 print_prompt
|
left_frame=0 right_frame=1 print_prompt
|
||||||
|
print -P ""
|
||||||
|
print -P "%B(4) Left and right.%b"
|
||||||
|
print -P ""
|
||||||
|
left_frame=1 right_frame=1 print_prompt
|
||||||
print -P ""
|
print -P ""
|
||||||
print -P "(r) Restart from the beginning."
|
print -P "(r) Restart from the beginning."
|
||||||
print -P ""
|
print -P ""
|
||||||
|
@ -540,7 +545,10 @@ function ask_frame() {
|
||||||
case $key in
|
case $key in
|
||||||
q) quit; return 1;;
|
q) quit; return 1;;
|
||||||
r) return 2;;
|
r) return 2;;
|
||||||
1|2|3) frame=$((key-1)); break;;
|
1) left_frame=0; right_frame=0; break;;
|
||||||
|
2) left_frame=1; right_frame=0; break;;
|
||||||
|
3) left_frame=0; right_frame=1; break;;
|
||||||
|
4) left_frame=1; right_frame=1; break;;
|
||||||
esac
|
esac
|
||||||
done
|
done
|
||||||
}
|
}
|
||||||
|
@ -741,11 +749,13 @@ function generate_config() {
|
||||||
|
|
||||||
sub MULTILINE_FIRST_PROMPT_GAP_CHAR "'$gap_char'"
|
sub MULTILINE_FIRST_PROMPT_GAP_CHAR "'$gap_char'"
|
||||||
|
|
||||||
if (( num_lines == 2 && frame < 2 )); then
|
if [[ $style == classic && $num_lines == 2 ]]; then
|
||||||
sub MULTILINE_FIRST_PROMPT_SUFFIX ''
|
if (( ! right_frame )); then
|
||||||
sub MULTILINE_NEWLINE_PROMPT_SUFFIX ''
|
sub MULTILINE_FIRST_PROMPT_SUFFIX ''
|
||||||
sub MULTILINE_LAST_PROMPT_SUFFIX ''
|
sub MULTILINE_NEWLINE_PROMPT_SUFFIX ''
|
||||||
if (( frame < 1 )); then
|
sub MULTILINE_LAST_PROMPT_SUFFIX ''
|
||||||
|
fi
|
||||||
|
if (( ! left_frame )); then
|
||||||
sub MULTILINE_FIRST_PROMPT_PREFIX ''
|
sub MULTILINE_FIRST_PROMPT_PREFIX ''
|
||||||
sub MULTILINE_NEWLINE_PROMPT_PREFIX ''
|
sub MULTILINE_NEWLINE_PROMPT_PREFIX ''
|
||||||
sub MULTILINE_LAST_PROMPT_PREFIX ''
|
sub MULTILINE_LAST_PROMPT_PREFIX ''
|
||||||
|
@ -781,11 +791,14 @@ function generate_config() {
|
||||||
'·') header+=", dotted";;
|
'·') header+=", dotted";;
|
||||||
'─') header+=", solid";;
|
'─') header+=", solid";;
|
||||||
esac
|
esac
|
||||||
case $frame in
|
if [[ $style == classic ]]; then
|
||||||
0) header+=", no frame";;
|
case $left_frame$right_frame in
|
||||||
1) header+=", left frame";;
|
00) header+=", no frame";;
|
||||||
2) header+=", full frame";;
|
01) header+=", right frame";;
|
||||||
esac
|
10) header+=", left frame";;
|
||||||
|
11) header+=", full frame";;
|
||||||
|
esac
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
(( empty_line )) && header+=", sparse" || header+=", compact";
|
(( empty_line )) && header+=", sparse" || header+=", compact";
|
||||||
header+=$'.\n#'
|
header+=$'.\n#'
|
||||||
|
@ -828,7 +841,7 @@ source $__p9k_root_dir/internal/icons.zsh || return
|
||||||
|
|
||||||
while true; do
|
while true; do
|
||||||
local POWERLEVEL9K_MODE= style= config_backup= gap_char=' '
|
local POWERLEVEL9K_MODE= style= config_backup= gap_char=' '
|
||||||
local -i num_lines=0 write_config=0 straight=0 empty_line=0 frame=1 color=1
|
local -i num_lines=0 write_config=0 straight=0 empty_line=0 left_frame=1 right_frame=1 color=1
|
||||||
local -i cap_diamond=0 cap_python=0 cap_narrow_icons=0 cap_lock=0
|
local -i cap_diamond=0 cap_python=0 cap_narrow_icons=0 cap_lock=0
|
||||||
local -a extra_icons=('' '')
|
local -a extra_icons=('' '')
|
||||||
local -a prefixes=('' '')
|
local -a prefixes=('' '')
|
||||||
|
|
Loading…
Reference in a new issue