Merge pull request #530 from akiyosi/improve-smoothscroll

Improve smooth scroll

Author: akiyosi

editor/config.go

@@ -356,7 +356,7 @@ func (c *gonvimConfig) init() {
 
 	c.Editor.LineToScroll = 1
 	c.Editor.SmoothScroll = false
-	c.Editor.SmoothScrollDuration = 300
+	c.Editor.SmoothScrollDuration = 750
 	c.Editor.DisableHorizontalScroll = false
 
 	c.Editor.DrawBorderForFloatWindow = false
@@ -370,7 +370,7 @@ func (c *gonvimConfig) init() {
 	c.Editor.DiffDeletePattern = 1
 	c.Editor.DiffChangePattern = 1
 
-	c.Cursor.Duration = 70
+	c.Cursor.Duration = 180
 
 	// ----
 

editor/cursor.go

@@ -12,6 +12,8 @@ import (
 // Cursor is
 type Cursor struct {
 	widgets.QWidget
+
+	smoothMoveAnimation  *core.QPropertyAnimation
 	charCache            *Cache
 	font                 *Font
 	fallbackfonts        []*Font
@@ -692,9 +694,10 @@ func (c *Cursor) redraw() {
 
 // paint() is to request update cursor widget.
 // NOTE: This function execution may not be necessary.
-//       This is because move() is performed in the redraw() of the cursor,
-//       and it seems that paintEvent is fired inside
-//       the cursor widget in conjunction with this move processing.
+//
+//	This is because move() is performed in the redraw() of the cursor,
+//	and it seems that paintEvent is fired inside
+//	the cursor widget in conjunction with this move processing.
 func (c *Cursor) paint() {
 	if editor.isKeyAutoRepeating {
 		return
@@ -703,6 +706,50 @@ func (c *Cursor) paint() {
 	c.Update()
 }
 
+func (c *Cursor) initializeOrReuseSmoothMoveAnimation() {
+	if c.smoothMoveAnimation == nil {
+		c.smoothMoveAnimation = core.NewQPropertyAnimation2(c, core.NewQByteArray2("animationProp", len("animationProp")), c)
+		c.smoothMoveAnimation.SetDuration(int(editor.config.Cursor.Duration))
+		c.smoothMoveAnimation.SetStartValue(core.NewQVariant10(float64(0.01)))
+		c.smoothMoveAnimation.SetEndValue(core.NewQVariant10(1))
+		c.smoothMoveAnimation.SetEasingCurve(core.NewQEasingCurve(core.QEasingCurve__OutExpo))
+
+		c.smoothMoveAnimation.ConnectValueChanged(func(value *core.QVariant) {
+			if !c.doAnimate {
+				c.delta = 0
+				c.deltax = 0
+				c.deltay = 0
+				c.move()
+				c.paint()
+				return
+			}
+			ok := false
+			v := value.ToDouble(&ok)
+			if !ok {
+				return
+			}
+
+			c.delta = v
+			c.deltax = (c.x - c.xprime) * v
+			c.deltay = (c.y - c.yprime) * v
+
+			if v == 1.0 {
+				c.delta = 0
+				c.deltax = 0
+				c.deltay = 0
+				c.doAnimate = false
+			}
+
+			if c.doAnimate {
+				c.animationStartX = c.xprime
+				c.animationStartY = c.yprime
+			}
+
+			c.move()
+		})
+	}
+}
+
 func (c *Cursor) animateMove() {
 	if !c.doAnimate {
 		return
@@ -711,61 +758,13 @@ func (c *Cursor) animateMove() {
 		return
 	}
 
-	// process smooth scroll
-	a := core.NewQPropertyAnimation2(c, core.NewQByteArray2("animationProp", len("animationProp")), c)
-	a.ConnectValueChanged(func(value *core.QVariant) {
-		if !c.doAnimate {
-			c.delta = 0
-			c.deltax = 0
-			c.deltay = 0
-			c.move()
-			c.paint()
-			return
-		}
-		ok := false
-		v := value.ToDouble(&ok)
-		if !ok {
-			return
-		}
+	c.initializeOrReuseSmoothMoveAnimation()
 
-		c.delta = v
-		c.deltax = (c.x - c.xprime) * v
-		c.deltay = (c.y - c.yprime) * v
-
-		if v == 1.0 {
-			c.delta = 0
-			c.deltax = 0
-			c.deltay = 0
-			c.doAnimate = false
-		}
-
-		if c.doAnimate {
-			c.animationStartX = c.xprime
-			c.animationStartY = c.yprime
-		}
+	if c.smoothMoveAnimation.State() == core.QAbstractAnimation__Running {
+		c.smoothMoveAnimation.Stop()
+	}
 
-		c.move()
-	})
-	duration := editor.config.Cursor.Duration
-	a.SetDuration(int(duration))
-	a.SetStartValue(core.NewQVariant10(float64(0.01)))
-	a.SetEndValue(core.NewQVariant10(1))
-	// a.SetEasingCurve(core.NewQEasingCurve(core.QEasingCurve__InOutCirc))
-	// a.SetEasingCurve(core.NewQEasingCurve(core.QEasingCurve__OutQuart))
-	// a.SetEasingCurve(core.NewQEasingCurve(core.QEasingCurve__OutExpo))
-	// a.SetEasingCurve(core.NewQEasingCurve(core.QEasingCurve__OutQuint))
-	// a.SetEasingCurve(core.NewQEasingCurve(core.QEasingCurve__InOutCubic))
-	// a.SetEasingCurve(core.NewQEasingCurve(core.QEasingCurve__InOutQuint))
-	// a.SetEasingCurve(core.NewQEasingCurve(core.QEasingCurve__Linear))
-	// a.SetEasingCurve(core.NewQEasingCurve(core.QEasingCurve__InQuart))
-	// a.SetEasingCurve(core.NewQEasingCurve(core.QEasingCurve__OutCubic))
-	// a.SetEasingCurve(core.NewQEasingCurve(core.QEasingCurve__InOutQuart))
-	// a.SetEasingCurve(core.NewQEasingCurve(core.QEasingCurve__OutInQuart))
-	// a.SetEasingCurve(core.NewQEasingCurve(core.QEasingCurve__InOutExpo))
-	a.SetEasingCurve(core.NewQEasingCurve(core.QEasingCurve__OutCirc))
-	// a.SetEasingCurve(core.NewQEasingCurve(core.QEasingCurve__InCubic))
-
-	a.Start(core.QAbstractAnimation__DeletionPolicy(core.QAbstractAnimation__DeleteWhenStopped))
+	c.smoothMoveAnimation.Start(core.QAbstractAnimation__DeletionPolicy(core.QAbstractAnimation__KeepWhenStopped))
 }
 
 func (c *Cursor) resize(width, height int) {

editor/input.go

@@ -15,17 +15,17 @@ func (e *Editor) keyRelease(event *gui.QKeyEvent) {
 		return
 	}
 
-	if editor.config.Editor.SmoothScroll {
-		ws := e.workspaces[e.active]
-		win, ok := ws.screen.getWindow(ws.cursor.gridid)
-		if !ok {
-			return
-		}
-		if win.scrollPixels2 != 0 {
-			return
-		}
-		win.grabScreenSnapshot()
-	}
+	// if editor.config.Editor.SmoothScroll {
+	// 	ws := e.workspaces[e.active]
+	// 	win, ok := ws.screen.getWindow(ws.cursor.gridid)
+	// 	if !ok {
+	// 		return
+	// 	}
+	// 	if win.scrollPixels2 != 0 {
+	// 		return
+	// 	}
+	// 	win.grabScreenSnapshot()
+	// }
 
 	e.isKeyAutoRepeating = false
 }
@@ -38,9 +38,12 @@ func (e *Editor) keyPress(event *gui.QKeyEvent) {
 	if ws.nvim == nil {
 		return
 	}
-	if !e.isKeyAutoRepeating {
-		ws.getSnapshot()
+	if event.IsAutoRepeat() {
+		e.isKeyAutoRepeating = true
 	}
+	// if !e.isKeyAutoRepeating {
+	// 	ws.getSnapshot()
+	// }
 	if !e.isHideMouse && e.config.Editor.HideMouseWhenTyping {
 		bc := gui.NewQCursor2(core.Qt__BlankCursor)
 		gui.QGuiApplication_SetOverrideCursor(bc)
@@ -51,9 +54,6 @@ func (e *Editor) keyPress(event *gui.QKeyEvent) {
 	input := e.convertKey(event)
 
 	e.putLog("key input for nvim::", "input:", input)
-	if event.IsAutoRepeat() {
-		e.isKeyAutoRepeating = true
-	}
 	if input != "" {
 		ws.nvim.Input(input)
 	}