felixangell/phi
1
1
Fork 0
mirror of https://github.com/felixangell/phi.git synced 2024-09-11 15:55:25 +03:00
Code Issues Projects Releases Wiki Activity

Fixed tab insertion/deletion in tabs-spaces mode.

Browse Source
This commit is contained in:
Felix Angell 2016-11-27 15:53:19 +00:00
parent 3244c0a5ae
commit 556e027011
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gui/buffer.go
View File

@ -115,8 +115,7 @@ func (b *Buffer) processActionKey(t *sdl.KeyDownEvent) {
// and check em
tabSize := int(b.cfg.Editor.Tab_Size)
lastTabSizeChars := b.contents[b.curs.y].Substr(b.curs.x+1-tabSize, tabSize).String()
artificialTab := string(make([]rune, tabSize, ' '))
if strings.Compare(lastTabSizeChars, artificialTab) == 0 {
if strings.Compare(lastTabSizeChars, b.makeTab()) == 0 {
// delete {TAB_SIZE} amount of characters
// from the cursors x pos
for i := 0; i < int(b.cfg.Editor.Tab_Size); i++ {
@ -174,7 +173,7 @@ func (b *Buffer) processActionKey(t *sdl.KeyDownEvent) {
if b.cfg.Editor.Tabs_Are_Spaces {
// make an empty rune array of TAB_SIZE, cast to string
// and insert it.
b.contents[b.curs.y] = b.contents[b.curs.y].Insert(b.curs.x, " ")
b.contents[b.curs.y] = b.contents[b.curs.y].Insert(b.curs.x, b.makeTab())
b.curs.move(int(b.cfg.Editor.Tab_Size), 0)
} else {
b.contents[b.curs.y] = b.contents[b.curs.y].Insert(b.curs.x, string('\t'))
@ -185,6 +184,15 @@ func (b *Buffer) processActionKey(t *sdl.KeyDownEvent) {
}
}
// TODO(Felix) this is really stupid
func (b *Buffer) makeTab() string {
blah := []rune{}
for i := 0; i < int(b.cfg.Editor.Tab_Size); i++ {
blah = append(blah, ' ')
}
return string(blah)
}
func renderString(font *ttf.Font, val string, col sdl.Color, smooth bool) *sdl.Surface {
if smooth {
text, err := font.RenderUTF8_Blended(val, col)