From 644e351c4a2ffeb1f16ae8926f743c3147353af6 Mon Sep 17 00:00:00 2001
From: Santiago Lo Coco <santilococo.01@gmail.com>
Date: Tue, 15 Feb 2022 19:24:54 -0300
Subject: [PATCH] Update calcHeight()

---
 dialog.sh         | 27 +++++++++++++++++++++++++++
 scripts/common.sh | 16 +++++++++++-----
 2 files changed, 38 insertions(+), 5 deletions(-)
 create mode 100644 dialog.sh

diff --git a/dialog.sh b/dialog.sh
new file mode 100644
index 0000000..eddf94d
--- /dev/null
+++ b/dialog.sh
@@ -0,0 +1,27 @@
+source scripts/common.sh
+setDialogBox "dialog"
+
+displayDialogBox --yesno "\nWould you like to set up gitconfig?" || return
+displayDialogBox --msgbox "\nNow, I will ask you for data to set up gitconfig personal account."
+gitPersonalName=$(displayDialogBox --inputbox "\nEnter a name." VALUES 3>&1 1>&2 2>&3)
+gitPersonalMail=$(displayDialogBox --inputbox "\nEnter an e-mail." VALUES 3>&1 1>&2 2>&3)
+displayDialogBox --yesno "$msg" && break
+gitPersonalName=$(displayDialogBox --inputbox "\nEnter a name." VALUES 3>&1 1>&2 2>&3)
+gitPersonalMail=$(displayDialogBox --inputbox "\nEnter an e-mail." VALUES 3>&1 1>&2 2>&3)
+displayDialogBox --yesno "\nWould you like to set up a work account?"
+gitWorkPath=$(displayDialogBox --inputbox "$msg" VALUES 3>&1 1>&2 2>&3)
+gitWorkPath=$(displayDialogBox --inputbox "$msg" VALUES 3>&1 1>&2 2>&3)
+gitWorkName=$(displayDialogBox --inputbox "\nEnter a name." VALUES 3>&1 1>&2 2>&3)
+gitWorkMail=$(displayDialogBox --inputbox "\nEnter an e-mail." VALUES 3>&1 1>&2 2>&3)
+displayDialogBox --yesno "$msg" && break
+gitWorkName=$(displayDialogBox --inputbox "\nEnter a name." VALUES 3>&1 1>&2 2>&3)
+gitWorkMail=$(displayDialogBox --inputbox "\nEnter an e-mail." VALUES 3>&1 1>&2 2>&3)
+displayDialogBox --title "sadedot" --yesno "$msg" || return
+displayDialogBox --infobox "\nUpdating sadedot submodule. Please wait." VALUES
+displayDialogBox --title "sadedot" --msgbox "\nAll done! Enjoy..."
+displayDialogBox --msgbox "\n$1" VALUES
+selectedOption=$(displayDialogBox --menu "$msg" VALUES 0 "${options[@]}" 3>&1 1>&2 2>&3)
+displayDialogBox --title "sadedot" --msgbox "\nAll done! Enjoy..."
+displayDialogBox --yes-label " Install all " --extra-button --extra-label " Select each " --no-label " Cancel " --yesno "$msg" || return
+# displayDialogBox --yesno "$msg" || return
+password=$(displayDialogBox --passwordbox "\nEnter your password." VALUES 3>&1 1>&2 2>&3)
diff --git a/scripts/common.sh b/scripts/common.sh
index 29f7bf9..1371d2a 100755
--- a/scripts/common.sh
+++ b/scripts/common.sh
@@ -49,7 +49,7 @@ useDialog() {
         done
     fi
     width=$(calcWidthDialog "$str")
-    height=$(calcHeightDialog "$str")
+    height=$(calcHeightDialog "$str" "$width")
     if [ $inputbox = true ] || [ $passwordbox = true ]; then
         width=$((width+15))
         height=$((height+2))
@@ -212,9 +212,15 @@ calcWidthDialog() {
 
 calcHeight() {
     newlines=$(echo -ne "$1" | grep -c $'\n')
-    height=$(echo "${#1}" "$newlines" | awk '{
-        x = (($1 - $2 + ($2 * 60)) / 60)
-        printf "%d", (x == int(x)) ? x : int(x) + 1
+    # width="$3"
+    # [ $((width)) -lt 60 ] && width=$(($3-4))
+    width="$(($3-4))"
+    height=$(echo "$((${#1}-1))" "$((newlines-1))" "$width" | awk '{
+        z = ($1 - $2) / $3
+        y = (z == int(z)) ? int(z) : int(z) + 1
+        n = ($2 / 1.3)
+        x = y + ((n - int(n) < 0.5) ? int(n) : int(n) + 1)
+        printf "%d", x
     }')
 }
 
@@ -225,7 +231,7 @@ calcHeightWhiptail() {
 
 calcHeightDialog() {
     calcHeight "$@"
-    echo $((4+height))
+    echo $((5+height))
 }
 
 checkCancel() {