From 2b41dafe668cdadcdfd9e2621ce410c37cf32be6 Mon Sep 17 00:00:00 2001
From: Dylan Araps <dylan.araps@gmail.com>
Date: Thu, 4 Aug 2016 09:20:42 +1000
Subject: [PATCH] Fix issues with prompt location calculation in image mode

---
 neofetch | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/neofetch b/neofetch
index 64f21e0d..368bd493 100755
--- a/neofetch
+++ b/neofetch
@@ -2314,6 +2314,7 @@ getimage () {
 
     # Calculate font size
     font_width="$((term_width / columns))"
+    font_height="$((term_height / lines))"
 
     # Image size is half of the terminal
     case "$image_size" in
@@ -3343,26 +3344,25 @@ fi
 # Print the info
 printinfo
 
-# Dynamic prompt location.
-case "$image" in
-    "ascii")
-        # Get cursor position
-        info_height="$(stty -echo; IFS=';' read -rdR -t 1 -d c -p $'\033[6n\033[c' ROW COL; printf "%s" "${ROW#*[}"; stty echo)"
+# Dynamic prompt location {{{
 
-        # Set cursor position dynamically based on height of ascii/text.
-        [ "${lines:-0}" -lt "${info_height:-0}" ] && lines="$info_height"
-    ;;
+# Get cursor position
+info_height="$(stty -echo; IFS=';' read -rdR -t 1 -d c -p $'\033[6n\033[c' ROW COL; printf "%s" "${ROW#*[}"; stty echo)"
 
-    "off") ;;
+# Calculate image height in terminal cells.
+# The '+ 3' adds a gap between the prompt and the content.
+[ "$image" != "ascii" ] && [ "$image" != "off" ] && \
+    lines="$((${height:-1} / ${font_height:-1} + 3))"
 
-    # Calculate image height in terminal cells.
-    *) lines="$((${width:-1} / ${font_width:-1} / 2 + 3))" ;;
-
-esac
+# If the info is higher than the ascii/image place the prompt
+# based on the info height instead of the ascii/image height.
+[ "${lines:-0}" -lt "${info_height:-0}" ] && lines="$info_height"
 
 # Set the prompt location
 [ "$image" != "off" ] && printf "%b%s" "\033[${lines:-0}H"
 
+# }}}
+
 # Re-enable line wrap
 [ "$line_wrap" == "off" ] && printf "%b%s" "\033[?7h"