humza/sml-projects
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fill in todo where strIdx is in tl, in text-window.sml function 'getStartLineWithCursorCentered

Browse Source
This commit is contained in:
Humza Shahid
2024-10-30 11:12:12 +00:00
parent 601a341992
commit 1316cdfe13
2 changed files with 40 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
fcore/text-window.sml
View File

@@ -196,7 +196,7 @@ struct
case stl of
hd :: tl =>
getCursorStartLine
(String.size hd - 1, str, lineNum, tl, maxW, halfH)
(String.size hd - 1, hd, lineNum, tl, maxW, halfH)
| [] =>
0
else
@@ -212,6 +212,30 @@ struct
(strPos - 1, str, lineNum, stl, maxW, halfH)
end
fun getLineNum (strIdx, lhd, bufferLine) =
if Vector.length lhd = 0 then
bufferLine
else if Vector.length lhd = 1 then
let
val lineIdx = Vector.sub (lhd, 0)
in
if lineIdx < strIdx then
bufferLine + 1
else
bufferLine
end
else
let
val firstLineIdx = Vector.sub (lhd, 0)
in
if firstLineIdx > strIdx then
bufferLine
else if firstLineIdx < strIdx then
Cursor.binSearch (strIdx - 1, lhd) + bufferLine
else
bufferLine + 1
end
(* Prerequisite: LineGap is moved to cursor *)
fun getStartLineWithCursorCentered
(lineGap: LineGap.t, cursorIdx, origLine, maxWidth, maxHeight) =
@@ -227,36 +251,26 @@ struct
if strIdx < String.size shd then
(* strIdx is in hd *)
let
val lineNum =
if Vector.length lhd = 0 then
bufferLine
else if Vector.length lhd = 1 then
let
val lineIdx = Vector.sub (lhd, 0)
in
if lineIdx < strIdx then
bufferLine + 1
else
bufferLine
end
else
let
val firstLineIdx = Vector.sub (lhd, 0)
in
if firstLineIdx > strIdx then
bufferLine
else if firstLineIdx < strIdx then
Cursor.binSearch (strIdx - 1, lhd) + bufferLine
else
bufferLine + 1
end
val lineNum = getLineNum (strIdx, lhd, bufferLine)
in
getCursorStartLine
(strIdx, shd, lineNum, leftStrings, maxWidth, maxHeight)
end
else
(* todo: strIdx is in tl *)
raise Match
(* strIdx is in tl *)
case (stl, ltl) of
(stlhd :: stltl, ltlhd :: _) =>
let
val strIdx = strIdx - String.size shd
val bufferLine = bufferLine + Vector.length lhd
val lineNum = getLineNum (strIdx, ltlhd, bufferLine)
val leftStrings = shd :: leftStrings
in
getCursorStartLine
(strIdx, stlhd, lineNum, leftStrings, maxWidth, maxHeight)
end
| (_, _) =>
origLine
end
| (_, _) =>
origLine