Merge branch 'master' into android2

This commit is contained in:
Dylan Araps 2016-10-22 10:11:38 +11:00
commit d1ef3ab4e8

View file

@ -2750,6 +2750,9 @@ bold() {
getlinebreak() { getlinebreak() {
linebreak=" " linebreak=" "
# Calculate info height
info_height="$((info_height+=1))"
} }
# }}} # }}}
@ -2938,10 +2941,10 @@ dynamicprompt() {
# Calculate image height in terminal cells. # Calculate image height in terminal cells.
# The '+ 1' adds a gap between the prompt and the content. # The '+ 1' adds a gap between the prompt and the content.
if [ "$image" != "ascii" ]; then if [ "$image" != "ascii" ]; then
lines="$((${height:-1} / ${font_height:-1} + 2))" lines="$((${height:-1} / ${font_height:-1} + 3))"
cursor_yoffset="$((${yoffset:-1} / ${font_height:-1}))" cursor_yoffset="$((${yoffset:-1} / ${font_height:-1}))"
else else
cursor_yoffset="0 - 4" cursor_yoffset="0 - 2"
fi fi
# If the info is higher than the ascii/image place the prompt # If the info is higher than the ascii/image place the prompt