light9 Changeset - 5f9d22f9c85b

Changeset - 5f9d22f9c85b

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

drewp@bigasterisk.com - 7 years ago 2018-06-01 01:39:40
drewp@bigasterisk.com

fix adjuster-drag coordinate bug. highlight nearby adj.
Ignore-this: 169a65c9b2932d453a630ee8d68fc1cf

2 files changed with 18 insertions and 9 deletions:

light9/web/timeline/adjusters.coffee

light9/web/timeline/viewstate.coffee

0 comments (0 inline, 0 general)

light9/web/timeline/adjusters.coffee

➞

Show inline comments

@@ @@ -11,12 +11,13 @@ coffeeElementSetup(class AdjustersCanvas @@
     'updateAllCoords(adjs)'
+  ]
   constructor: ->
     super()
     @redraw = _.throttle(@_throttledRedraw.bind(@), 30, {leading: false})
     @adjs = {}
     @hoveringNear = null
   ready: ->
     super.ready()
     @addEventListener('iron-resize', @resizeUpdate.bind(@))
     @ctx = @$.canvas.getContext('2d')
@@ @@ -24,28 +25,37 @@ coffeeElementSetup(class AdjustersCanvas @@
     @setAdjuster = @_setAdjuster.bind(@)
     # These don't fire; TimelineEditor calls the handlers for us.
     @addEventListener('mousedown', @onDown.bind(@))
     @addEventListener('mousemove', @onMove.bind(@))
     @addEventListener('mouseup', @onUp.bind(@))
   _mousePos: (ev) ->
     $V([ev.clientX, ev.clientY - @offsetParent.offsetTop])
   onDown: (ev) ->
     if ev.buttons == 1
-      start = $V([ev.x, ev.y])
+      start = @_mousePos(ev)
       adj = @_adjAtPoint(start)
       if adj
         ev.stopPropagation()
         @currentDrag = {start: start, adj: adj}
         adj.startDrag()
   onMove: (ev) ->
-    pos = $V([ev.x, ev.y])
+    pos = @_mousePos(ev)
     if @currentDrag
       @hoveringNear = null
       @currentDrag.cur = pos
       @currentDrag.adj.continueDrag(
         @currentDrag.cur.subtract(@currentDrag.start))
     else
       near = @_adjAtPoint(pos)
       if @hoveringNear != near
         @hoveringNear = near
         @redraw()
   onUp: (ev) ->
     return unless @currentDrag
     @currentDrag.adj.endDrag()
     @currentDrag = null
@@ @@ -68,14 +78,12 @@ coffeeElementSetup(class AdjustersCanvas @@
   updateAllCoords: ->
     @redraw()
   _adjAtPoint: (pt) ->
     nearest = @qt.find(pt.e(1), pt.e(2))
     if nearest?
       log('near', nearest.distanceFrom(pt))
     if not nearest? or nearest.distanceFrom(pt) > maxDist
       return null
     return nearest?.adj
   resizeUpdate: (ev) ->
     @$.canvas.width = ev.target.offsetWidth
@@ @@ -96,13 +104,14 @@ coffeeElementSetup(class AdjustersCanvas @@
       if @_isOffScreen(target)
         continue
       @_drawConnector(ctr, target)
       @_drawAdjuster(adj.getDisplayValue(),
                      ctr.e(1) - 20, ctr.e(2) - 10,
                      ctr.e(1) + 20, ctr.e(2) + 10)
                      ctr.e(1) + 20, ctr.e(2) + 10,
                      adj == @hoveringNear)
     console.timeEnd('adjs redraw')
   _layoutCenters: ->
     # push Adjustable centers around to avoid overlaps
     # Todo: also don't overlap inlineattr boxes
     # Todo: don't let their connector lines cross each other
@@ @@ -149,21 +158,21 @@ coffeeElementSetup(class AdjustersCanvas @@
     @ctx.strokeStyle = '#aaa'
     @ctx.lineWidth = 2
     @ctx.beginPath()
     Drawing.line(@ctx, ctr, target)
     @ctx.stroke()
   _drawAdjuster: (label, x1, y1, x2, y2) ->
+  _drawAdjuster: (label, x1, y1, x2, y2, hover) ->
     radius = 8
     @ctx.shadowColor = 'black'
     @ctx.shadowBlur = 15
     @ctx.shadowOffsetX = 5
     @ctx.shadowOffsetY = 9
     @ctx.fillStyle = 'rgba(255, 255, 0, 0.5)'
+    @ctx.fillStyle = if hover then '#ffff88' else 'rgba(255, 255, 0, 0.5)'
     @ctx.beginPath()
     Drawing.roundRect(@ctx, x1, y1, x2, y2, radius)
     @ctx.fill()
     @ctx.shadowColor = 'rgba(0,0,0,0)'

light9/web/timeline/viewstate.coffee

➞

Show inline comments

@@ @@ -35,13 +35,13 @@ class window.ViewState @@
     if @zoomSpec.t1() < 0
       @zoomSpec.t1(0)
     if @zoomSpec.duration() and @zoomSpec.t2() > @zoomSpec.duration()
       @zoomSpec.t2(@zoomSpec.duration())
-    rightPad = 2 # don't let time adjuster fall off right edge
+    rightPad = 5 # don't let time adjuster fall off right edge
     @fullZoomX.domain([0, @zoomSpec.duration()])
     @fullZoomX.range([0, @width() - rightPad])
     @zoomInX.domain([@zoomSpec.t1(), @zoomSpec.t2()])
     @zoomInX.range([0, @width() - rightPad])

0 comments (0 inline, 0 general)