better naming of functions to create search/char highlight
This commit is contained in:
@@ -157,7 +157,7 @@ struct
|
||||
, #cursorB env
|
||||
)
|
||||
|
||||
fun makeHighlight (posX, posY, env: env_data) =
|
||||
fun makeSearchHighlight (posX, posY, env: env_data) =
|
||||
Rect.lerp
|
||||
( Real32.fromInt (posX - 2)
|
||||
, Real32.fromInt posY
|
||||
@@ -184,7 +184,7 @@ struct
|
||||
, #charB env
|
||||
)
|
||||
|
||||
fun makeCursorOnChr (chr, posX, posY, env: env_data) =
|
||||
fun makeCursorHighlightedChr (chr, posX, posY, env: env_data) =
|
||||
CozetteAscii.make
|
||||
( chr
|
||||
, Real32.fromInt posX
|
||||
@@ -198,7 +198,7 @@ struct
|
||||
, #cursorHighlightedCharB env
|
||||
)
|
||||
|
||||
fun makeHighlightChr (chr, posX, posY, env: env_data) =
|
||||
fun makeSearchHighlightedChr (chr, posX, posY, env: env_data) =
|
||||
CozetteAscii.make
|
||||
( chr
|
||||
, Real32.fromInt posX
|
||||
|
||||
@@ -226,8 +226,10 @@ struct
|
||||
let
|
||||
val acc =
|
||||
if absIdx = cursorIdx then
|
||||
let val acc = Utils.makeCursor (posX, posY, env) :: acc
|
||||
in Utils.makeCursorOnChr (chr, posX, posY, env) :: acc
|
||||
let
|
||||
val acc = Utils.makeCursor (posX, posY, env) :: acc
|
||||
in
|
||||
Utils.makeCursorHighlightedChr (chr, posX, posY, env) :: acc
|
||||
end
|
||||
else
|
||||
Utils.makeChr (chr, posX, posY, env) :: acc
|
||||
|
||||
@@ -146,7 +146,7 @@ struct
|
||||
acc
|
||||
val acc =
|
||||
if PersistentVector.isInRange (absIdx, #searchList env) then
|
||||
Utils.makeHighlight (posX, posY, env) :: acc
|
||||
Utils.makeSearchHighlight (posX, posY, env) :: acc
|
||||
else
|
||||
acc
|
||||
val posX =
|
||||
@@ -231,11 +231,11 @@ struct
|
||||
let
|
||||
val acc =
|
||||
if absIdx = cursorIdx then
|
||||
Utils.makeCursorOnChr (chr, posX, posY, env)
|
||||
Utils.makeCursorHighlightedChr (chr, posX, posY, env)
|
||||
:: Utils.makeCursor (posX, posY, env) :: acc
|
||||
else if PersistentVector.isInRange (absIdx, #searchList env) then
|
||||
Utils.makeHighlightChr (chr, posX, posY, env)
|
||||
:: Utils.makeHighlight (posX, posY, env) :: acc
|
||||
Utils.makeSearchHighlightedChr (chr, posX, posY, env)
|
||||
:: Utils.makeSearchHighlight (posX, posY, env) :: acc
|
||||
else
|
||||
Utils.makeChr (chr, posX, posY, env) :: acc
|
||||
in
|
||||
|
||||
Reference in New Issue
Block a user