github/zyedidia.micro
2
0
Fork 0
mirror of https://github.com/zyedidia/micro.git synced 2026-03-29 06:12:35 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #130 from onodera-punpun/center_search

Browse Source 
Add a bit of "padding" to relocate.
This commit is contained in:
Zachary Yedidia
2016-05-22 15:35:29 -04:00
parent f9adcd525d 52f1be5725
commit 74e55f03fe
3 changed files with 82 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/micro/settings.go
View File

@@ -81,7 +81,8 @@ func DefaultSettings() map[string]interface{} {
"tabsToSpaces": false,
"ruler": true,
"statusline": true,
"scrollSpeed": float64(2),
"scrollmargin": float64(3),
"scrollspeed": float64(2),
}
}

18
cmd/micro/view.go
View File

@@ -195,12 +195,16 @@ func (v *View) ReOpen() {
func (v *View) Relocate() bool {
ret := false
cy := v.Cursor.y
if cy < v.Topline {
scrollmargin := int(settings["scrollmargin"].(float64))
if cy < v.Topline+scrollmargin && cy > scrollmargin-1 {
v.Topline = cy - scrollmargin
ret = true
} else if cy < v.Topline {
v.Topline = cy
ret = true
}
if cy > v.Topline+v.height-1 {
v.Topline = cy - v.height + 1
if cy > v.Topline+v.height-1-scrollmargin {
v.Topline = cy - v.height + 1 + scrollmargin
ret = true
}
@@ -363,12 +367,12 @@ func (v *View) HandleEvent(event tcell.Event) {
}
case tcell.WheelUp:
// Scroll up
scrollSpeed := int(settings["scrollSpeed"].(float64))
v.ScrollUp(scrollSpeed)
scrollspeed := int(settings["scrollspeed"].(float64))
v.ScrollUp(scrollspeed)
case tcell.WheelDown:
// Scroll down
scrollSpeed := int(settings["scrollSpeed"].(float64))
v.ScrollDown(scrollSpeed)
scrollspeed := int(settings["scrollspeed"].(float64))
v.ScrollDown(scrollspeed)
}
}