previously forgot to draw char in text builder, but we do that now
This commit is contained in:
@@ -77,7 +77,8 @@ struct
|
|||||||
, cursor :: initialTextAcc
|
, cursor :: initialTextAcc
|
||||||
)
|
)
|
||||||
val drawMsg = Vector.concat drawMsg
|
val drawMsg = Vector.concat drawMsg
|
||||||
val msgs = [DrawMsg.DRAW_TEXT drawMsg]
|
val drawMsg = DrawMsg.DRAW_TEXT drawMsg
|
||||||
|
val msgs = [MailboxType.DRAW drawMsg]
|
||||||
in
|
in
|
||||||
NormalSearchModeWith.changeTempSearchString
|
NormalSearchModeWith.changeTempSearchString
|
||||||
(app, buffer, startLine, mode, msgs)
|
(app, buffer, startLine, mode, msgs)
|
||||||
@@ -150,7 +151,8 @@ struct
|
|||||||
, cursor :: initialTextAcc
|
, cursor :: initialTextAcc
|
||||||
)
|
)
|
||||||
val drawMsg = Vector.concat drawMsg
|
val drawMsg = Vector.concat drawMsg
|
||||||
val msgs = [DrawMsg.DRAW_TEXT drawMsg]
|
val drawMsg = DrawMsg.DRAW_TEXT drawMsg
|
||||||
|
val msgs = [MailboxType.DRAW drawMsg]
|
||||||
in
|
in
|
||||||
NormalSearchModeWith.bufferAndSize
|
NormalSearchModeWith.bufferAndSize
|
||||||
(app, buffer, newWindowWidth, newWindowHeight, msgs)
|
(app, buffer, newWindowWidth, newWindowHeight, msgs)
|
||||||
|
|||||||
@@ -47,7 +47,15 @@ struct
|
|||||||
(* save search string and tempSearchList and return to normal mode *)
|
(* save search string and tempSearchList and return to normal mode *)
|
||||||
fun saveSearch (app: app_type, searchString, tempSearchList, time) =
|
fun saveSearch (app: app_type, searchString, tempSearchList, time) =
|
||||||
let
|
let
|
||||||
val {buffer, cursorIdx, windowWidth, windowHeight, startLine, ...} = app
|
val
|
||||||
|
{ buffer
|
||||||
|
, cursorIdx
|
||||||
|
, windowWidth
|
||||||
|
, windowHeight
|
||||||
|
, startLine
|
||||||
|
, visualScrollColumn
|
||||||
|
, ...
|
||||||
|
} = app
|
||||||
|
|
||||||
val buffer = LineGap.goToStart buffer
|
val buffer = LineGap.goToStart buffer
|
||||||
val searchString = EscapeString.unescape searchString
|
val searchString = EscapeString.unescape searchString
|
||||||
@@ -63,7 +71,7 @@ struct
|
|||||||
(* move buffer to new startLine as required by TextBuilder.build *)
|
(* move buffer to new startLine as required by TextBuilder.build *)
|
||||||
val buffer = LineGap.goToLine (startLine, buffer)
|
val buffer = LineGap.goToLine (startLine, buffer)
|
||||||
|
|
||||||
val msgs = TextBuilder.build
|
val drawMsg = NormalModeTextBuilder.build
|
||||||
( startLine
|
( startLine
|
||||||
, cursorIdx
|
, cursorIdx
|
||||||
, buffer
|
, buffer
|
||||||
@@ -71,8 +79,11 @@ struct
|
|||||||
, windowHeight
|
, windowHeight
|
||||||
, tempSearchList
|
, tempSearchList
|
||||||
, searchString
|
, searchString
|
||||||
, initialMsg
|
, visualScrollColumn
|
||||||
)
|
)
|
||||||
|
val drawMsg = Vector.concat drawMsg
|
||||||
|
val drawMsg = DrawMsg.DRAW_TEXT drawMsg
|
||||||
|
val msgs = DRAW drawMsg :: initialMsg
|
||||||
|
|
||||||
val mode = NORMAL_MODE ""
|
val mode = NORMAL_MODE ""
|
||||||
in
|
in
|
||||||
|
|||||||
@@ -207,7 +207,8 @@ struct
|
|||||||
in Utils.makeCursorOnChr (chr, posX, posY, env) :: acc
|
in Utils.makeCursorOnChr (chr, posX, posY, env) :: acc
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
Utils.makeCursor (posX, posY, env) :: acc
|
Utils.makeChr (chr, posX, posY, env)
|
||||||
|
:: Utils.makeCursor (posX, posY, env) :: acc
|
||||||
in
|
in
|
||||||
build
|
build
|
||||||
( pos + 1
|
( pos + 1
|
||||||
|
|||||||
@@ -276,7 +276,7 @@ struct
|
|||||||
Utils.makeHighlightChr (chr, posX, posY, env)
|
Utils.makeHighlightChr (chr, posX, posY, env)
|
||||||
:: Utils.makeHighlight (posX, posY, env) :: acc
|
:: Utils.makeHighlight (posX, posY, env) :: acc
|
||||||
else
|
else
|
||||||
acc
|
Utils.makeChr (chr, posX, posY, env) :: acc
|
||||||
in
|
in
|
||||||
build
|
build
|
||||||
( pos + 1
|
( pos + 1
|
||||||
|
|||||||
@@ -152,7 +152,7 @@ struct
|
|||||||
let
|
let
|
||||||
val shellState = consumeDrawEvents shellState
|
val shellState = consumeDrawEvents shellState
|
||||||
|
|
||||||
val _ = Gles3.clearColor (0.087, 0.095, 0.13, 1.0)
|
val _ = Gles3.clearColor (0.3, 0.3, 0.3, 1.0)
|
||||||
val _ = Gles3.clear ()
|
val _ = Gles3.clear ()
|
||||||
|
|
||||||
val app = update app
|
val app = update app
|
||||||
|
|||||||
Reference in New Issue
Block a user