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

better naming of functions to create search/char highlight

Browse Source
This commit is contained in:
Humza Shahid
2025-10-15 10:01:50 +01:00
parent e2ed022ccc
commit 60b6cc6d6d
3 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
fcore/text-builder/text-builder-utils.sml
View File

@@ -157,7 +157,7 @@ struct
, #cursorB env , #cursorB env
) )
fun makeHighlight (posX, posY, env: env_data) = fun makeSearchHighlight (posX, posY, env: env_data) =
Rect.lerp Rect.lerp
( Real32.fromInt (posX - 2) ( Real32.fromInt (posX - 2)
, Real32.fromInt posY , Real32.fromInt posY
@@ -184,7 +184,7 @@ struct
, #charB env , #charB env
) )
fun makeCursorOnChr (chr, posX, posY, env: env_data) = fun makeCursorHighlightedChr (chr, posX, posY, env: env_data) =
CozetteAscii.make CozetteAscii.make
( chr ( chr
, Real32.fromInt posX , Real32.fromInt posX
@@ -198,7 +198,7 @@ struct
, #cursorHighlightedCharB env , #cursorHighlightedCharB env
) )
fun makeHighlightChr (chr, posX, posY, env: env_data) = fun makeSearchHighlightedChr (chr, posX, posY, env: env_data) =
CozetteAscii.make CozetteAscii.make
( chr ( chr
, Real32.fromInt posX , Real32.fromInt posX

6
fcore/text-builder/text-builder-with-cursor.sml
View File

@@ -226,8 +226,10 @@ struct
let let
val acc = val acc =
if absIdx = cursorIdx then if absIdx = cursorIdx then
let val acc = Utils.makeCursor (posX, posY, env) :: acc let
in Utils.makeCursorOnChr (chr, posX, posY, env) :: acc val acc = Utils.makeCursor (posX, posY, env) :: acc
in
Utils.makeCursorHighlightedChr (chr, posX, posY, env) :: acc
end end
else else
Utils.makeChr (chr, posX, posY, env) :: acc Utils.makeChr (chr, posX, posY, env) :: acc

8
fcore/text-builder/text-builder-with-highlight.sml
View File

@@ -146,7 +146,7 @@ struct
acc acc
val acc = val acc =
if PersistentVector.isInRange (absIdx, #searchList env) then if PersistentVector.isInRange (absIdx, #searchList env) then
Utils.makeHighlight (posX, posY, env) :: acc Utils.makeSearchHighlight (posX, posY, env) :: acc
else else
acc acc
val posX = val posX =
@@ -231,11 +231,11 @@ struct
let let
val acc = val acc =
if absIdx = cursorIdx then if absIdx = cursorIdx then
Utils.makeCursorOnChr (chr, posX, posY, env) Utils.makeCursorHighlightedChr (chr, posX, posY, env)
:: Utils.makeCursor (posX, posY, env) :: acc :: Utils.makeCursor (posX, posY, env) :: acc
else if PersistentVector.isInRange (absIdx, #searchList env) then else if PersistentVector.isInRange (absIdx, #searchList env) then
Utils.makeHighlightChr (chr, posX, posY, env) Utils.makeSearchHighlightedChr (chr, posX, posY, env)
:: Utils.makeHighlight (posX, posY, env) :: acc :: Utils.makeSearchHighlight (posX, posY, env) :: acc
else else
Utils.makeChr (chr, posX, posY, env) :: acc Utils.makeChr (chr, posX, posY, env) :: acc
in in