From 2fc0515d2e8fbb6d3112c1757f199a5046089762 Mon Sep 17 00:00:00 2001
From: FellippeHeitor <fellippeheitor@gmail.com>
Date: Thu, 22 Jul 2021 03:05:54 -0300
Subject: [PATCH] Adjustments to dialogs.

SUBs, Call Stack, Languages will no longer take up the whole window.
---
 source/ide/ide_methods.bas | 44 +++++++++++++++++++++++++++-----------
 1 file changed, 32 insertions(+), 12 deletions(-)

diff --git a/source/ide/ide_methods.bas b/source/ide/ide_methods.bas
index 3c8875774..7d6824399 100644
--- a/source/ide/ide_methods.bas
+++ b/source/ide/ide_methods.bas
@@ -6927,19 +6927,25 @@ FUNCTION idecallstackbox
     '-------- init --------
 
     i = 0
-    idepar p, idewx - 8, idewy + idesubwindow - 6, "$DEBUG MODE"
+
+    dialogHeight = callStackLength + 4
+    IF dialogHeight > idewy + idesubwindow - 6 THEN
+        dialogHeight = idewy + idesubwindow - 6
+    END IF
+
+    idepar p, idewx - 8, dialogHeight, "$DEBUG MODE"
 
     i = i + 1
     o(i).typ = 2
     o(i).y = 2
-    o(i).w = idewx - 12: o(i).h = idewy + idesubwindow - 10
+    o(i).w = idewx - 12: o(i).h = dialogHeight - 4
     o(i).txt = idenewtxt(callstacklist$)
     o(i).sel = callStackLength
     o(i).nam = idenewtxt("Call Stack")
 
     i = i + 1
     o(i).typ = 3
-    o(i).y = idewy + idesubwindow - 6
+    o(i).y = dialogHeight
     o(i).txt = idenewtxt("#Close")
     o(i).dft = 1
 
@@ -8291,6 +8297,7 @@ FUNCTION idegetline$ (i)
 END FUNCTION
 
 SUB idecentercurrentline
+    IF iden <= idewy - 8 THEN EXIT SUB
     idesy = idecy - (idewy - 8) \ 2
     IF idesy < 1 THEN idesy = 1
 END SUB
@@ -8769,6 +8776,7 @@ FUNCTION idefiledialog$(programname$, mode AS _BYTE)
         '-------- custom display changes --------
         COLOR 0, 7: _PRINTSTRING (p.x + 2, p.y + 4), "Path: "
         a$ = path$
+        IF LEN(a$) = 2 AND RIGHT$(a$, 1) = ":" THEN a$ = a$ + "\"
         w = p.w - 8
         IF LEN(a$) > w - 3 THEN a$ = STRING$(3, 250) + RIGHT$(a$, w - 3)
         _PRINTSTRING (p.x + 2 + 6, p.y + 4), a$
@@ -10095,13 +10103,17 @@ FUNCTION idesubs$
 
     '72,19
     i = 0
-    idepar p, idewx - 8, idewy + idesubwindow - 6, "SUBs"
+    dialogHeight = TotalSUBs + 4
+    IF dialogHeight > idewy + idesubwindow - 6 THEN
+        dialogHeight = idewy + idesubwindow - 6
+    END IF
+    idepar p, idewx - 8, dialogHeight, "SUBs"
 
     i = i + 1
     o(i).typ = 2
     o(i).y = 1
     '68
-    o(i).w = idewx - 12: o(i).h = idewy + idesubwindow - 9
+    o(i).w = idewx - 12: o(i).h = dialogHeight - 3
     IF SortedSubsFlag = 0 THEN
         IF IDESubsLength THEN
             o(i).txt = idenewtxt(lSized$)
@@ -10142,14 +10154,14 @@ FUNCTION idesubs$
     i = i + 1
     o(i).typ = 4 'check box
     o(i).x = 2
-    o(i).y = idewy + idesubwindow - 6
+    o(i).y = dialogHeight
     o(i).nam = idenewtxt("#Line Count")
     o(i).sel = IDESubsLength
 
     i = i + 1
     o(i).typ = 4 'check box
     o(i).x = 18
-    o(i).y = idewy + idesubwindow - 6
+    o(i).y = dialogHeight
     o(i).nam = idenewtxt("#Sort")
     o(i).sel = SortedSubsFlag
 
@@ -10157,8 +10169,12 @@ FUNCTION idesubs$
     o(i).typ = 3
     o(i).x = p.x + p.w - 26
     o(i).w = 26
-    o(i).y = idewy + idesubwindow - 6
-    o(i).txt = idenewtxt("#Edit" + sep + "#Cancel")
+    o(i).y = dialogHeight
+    IF IdeDebugMode = 0 THEN
+        o(i).txt = idenewtxt("#Edit" + sep + "#Cancel")
+    ELSE
+        o(i).txt = idenewtxt("#View" + sep + "#Cancel")
+    END IF
     o(i).dft = 1
 
 
@@ -10379,19 +10395,23 @@ FUNCTION idelanguagebox
     l$ = UCASE$(l$)
 
     i = 0
-    idepar p, idewx - 8, idewy + idesubwindow - 6, "Language"
+    dialogHeight = idecpnum + 4
+    IF dialogHeight > idewy + idesubwindow - 6 THEN
+        dialogHeight = idewy + idesubwindow - 6
+    END IF
+    idepar p, idewx - 8, dialogHeight, "Language"
 
     i = i + 1
     o(i).typ = 2
     o(i).y = 2
-    o(i).w = idewx - 12: o(i).h = idewy + idesubwindow - 10
+    o(i).w = idewx - 12: o(i).h = dialogheight - 4
     o(i).txt = idenewtxt(l$)
     o(i).sel = 1: IF idecpindex THEN o(i).sel = idecpindex
     o(i).nam = idenewtxt("Code Pages")
 
     i = i + 1
     o(i).typ = 3
-    o(i).y = idewy + idesubwindow - 6
+    o(i).y = dialogheight
     o(i).txt = idenewtxt("#OK" + sep + "#Cancel")
     o(i).dft = 1