bloeys/gopad
1
0
Fork 0
mirror of https://github.com/bloeys/gopad.git synced 2025-12-29 15:08:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Handle files with no new line at the end+cursor coord comments

Browse Source
This commit is contained in:
bloeys
2022-02-27 14:51:07 +04:00
parent eb3ce8e466
commit 3c3b480ec5
1 changed files with 24 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
editor.go
View File

@ -101,26 +101,34 @@ func (e *Editor) Render(drawStartPos, winSize *imgui.Vec2) {
//Window coords are as reported by SDL, but we correct for padding and snap to the nearest //Window coords are as reported by SDL, but we correct for padding and snap to the nearest
//char window pos. //char window pos.
// //
//Since gopad only supports fixed-width fonts, we treat the text area as a grid with each //Since Gopad only supports fixed-width fonts, we treat the text area as a grid with each
//cell having identical width and one char. //cell having identical width and one char.
clickedColWindowY := clampInt(e.MouseY-int(paddedDrawStartPos.Y), 0, math.MaxInt) //
clickedColGridY := clampInt(clickedColWindowY/int(e.LineHeight), 0, e.LineCount) //Global suffix means the position is in window coords.
//Editor suffix means coords are within the text editor coords, where sidebar and tabs have been adjusted for
clickedColWindowYEditor := clampInt(e.MouseY-int(paddedDrawStartPos.Y), 0, math.MaxInt)
clickedColGridYEditor := clampInt(clickedColWindowYEditor/int(e.LineHeight), 0, e.LineCount)
clickedColWindowX := clampInt(int(e.RoundToNearestChar(float32(e.MouseX))), 0, math.MaxInt) clickedColWindowXGlobal := clampInt(int(e.RoundToNearestChar(float32(e.MouseX))), 0, math.MaxInt)
clickedColGridX := clickedColWindowX / int(e.CharWidth) clickedColWindowXEditor := clampInt(int(e.RoundToNearestChar(float32(e.MouseX)-paddedDrawStartPos.X)), 0, math.MaxInt)
clickedColGridXEditor := clickedColWindowXEditor / int(e.CharWidth)
clickedLine := e.GetLine(startLine + clickedColGridY)
tabCount, _ := getTabs(clickedLine, clickedColGridX)
//Draw cursor
clickedLine := e.GetLine(startLine + clickedColGridYEditor)
tabCount, charOffsetFromTabs := getTabs(clickedLine, clickedColGridXEditor)
textWidth := float32(len(clickedLine.chars)-tabCount+tabCount*settings.TabSize) * e.CharWidth textWidth := float32(len(clickedLine.chars)-tabCount+tabCount*settings.TabSize) * e.CharWidth
lineX := clampF32(float32(clickedColWindowX), 0, paddedDrawStartPos.X+textWidth) lineX := clampF32(
e.RoundToNearestChar(float32(clickedColWindowXGlobal)+float32(charOffsetFromTabs)*e.CharWidth),
0,
paddedDrawStartPos.X+textWidth,
)
lineStart := imgui.Vec2{ lineStart := imgui.Vec2{
X: lineX, X: lineX,
Y: paddedDrawStartPos.Y + float32(clickedColGridY)*e.LineHeight - e.LineHeight*0.25, Y: paddedDrawStartPos.Y + float32(clickedColGridYEditor)*e.LineHeight - e.LineHeight*0.25,
} }
lineEnd := imgui.Vec2{ lineEnd := imgui.Vec2{
X: lineX, X: lineX,
Y: paddedDrawStartPos.Y + float32(clickedColGridY)*e.LineHeight + e.LineHeight*0.75, Y: paddedDrawStartPos.Y + float32(clickedColGridYEditor)*e.LineHeight + e.LineHeight*0.75,
} }
dl.AddLineV(lineStart, lineEnd, imgui.PackedColorFromVec4(imgui.Vec4{Z: 0.7, W: 1}), settings.CursorWidthFactor*e.CharWidth) dl.AddLineV(lineStart, lineEnd, imgui.PackedColorFromVec4(imgui.Vec4{Z: 0.7, W: 1}), settings.CursorWidthFactor*e.CharWidth)
} }
@ -208,6 +216,11 @@ func ParseLines(fileContents string) (*LinesNode, int) {
} }
} }
if fileContents[len(fileContents)-1] != '\n' {
lineCount++
currNode.Lines[currLine].chars = []rune(fileContents[start:end])
}
return head, lineCount return head, lineCount
} }