light9 Changeset - 849599175e99

Changeset - 849599175e99

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

Drew Perttula - 7 years ago 2018-05-17 06:50:11
drewp@bigasterisk.com

adjusters start displaying again. just timeline zoom ones.
Ignore-this: 31fb30b2020314f3e1dcdcadefa422c1

3 files changed with 22 insertions and 22 deletions:

light9/web/timeline/adjusters.coffee

light9/web/timeline/timeline-elements.html

light9/web/timeline/timeline.coffee

0 comments (0 inline, 0 general)

light9/web/timeline/adjusters.coffee

➞

Show inline comments

@@ @@ -2,13 +2,13 @@ log = console.log @@
 Drawing = window.Drawing
 coffeeElementSetup(class AdjustersCanvas extends Polymer.mixinBehaviors([Polymer.IronResizableBehavior], Polymer.Element)
   @is: 'light9-adjusters-canvas'
   @getter_properties:
-    adjs: { type: Object, notify: true }, # adjId: Adjustable
+    setAdjuster: {type: Function, notify: true }
   @getter_observers: [
     'updateAllCoords(adjs)'
+  ]
   constructor: ->
     super()
     @redraw = _.throttle(@_throttledRedraw.bind(@), 30, {leading: false})
@@ @@ -17,12 +17,17 @@ coffeeElementSetup(class AdjustersCanvas @@
   ready: ->
     super.ready()
     @addEventListener('iron-resize', @resizeUpdate.bind(@))
     @ctx = @$.canvas.getContext('2d')
     @redraw()
     @setAdjuster = @_setAdjuster.bind(@)
     @addEventListener('mousedown', @onDown.bind(@))
     @addEventListener('mousemove', @onMove.bind(@))
     @addEventListener('mouseup', @onUp.bind(@))
   onDown: (ev) ->
     if ev.buttons == 1
       ev.stopPropagation()
       start = $V([ev.x, ev.y])
       adj = @_adjAtPoint(start)
@@ @@ -38,27 +43,26 @@ coffeeElementSetup(class AdjustersCanvas @@
   onUp: (ev) ->
     return unless @currentDrag
     @currentDrag.adj.endDrag()
     @currentDrag = null
-  setAdjuster: (adjId, makeAdjustable) ->
+  _setAdjuster: (adjId, makeAdjustable) ->
     # callers register/unregister the Adjustables they want us to make
     # adjuster elements for. Caller invents adjId.  makeAdjustable is
     # a function returning the Adjustable or it is null to clear any
     # adjusters with this id.
     if not @adjs[adjId] or not makeAdjustable?
       if not makeAdjustable?
         delete @adjs[adjId]
       else
         adj = makeAdjustable()
         @adjs[adjId] = adj
         adj.id = adjId
     #@debounce('adj redraw', @redraw.bind(@))
     setTimeout((() => @redraw()), 2)
     @redraw()
     window.debug_adjsCount = Object.keys(@adjs).length
   updateAllCoords: ->
     @redraw()

light9/web/timeline/timeline-elements.html

➞

Show inline comments

@@ @@ -135,14 +135,16 @@ @@
      wrong in the case of notes?)
    -->
 <dom-module id="light9-timeline-diagram-layer">
   <template>
     <style>
      :host {
          pointer-events: none;
+     }
      svg {
          pointer-events: none;
          width: 100%;
          height: 100%;
+     }
      #notes > path {
          stroke:#000000;
          stroke-width:1.5;
@@ @@ -186,13 +188,13 @@ @@
   </template>
 </dom-module>
 <dom-module id="light9-adjusters-canvas">
   <template>
     <style>
-     #canvas, :host {
      #canvas {
          pointer-events: none;
+     }
     </style>
     <canvas id="canvas"></canvas>
   </template>
 </dom-module>

light9/web/timeline/timeline.coffee

➞

Show inline comments

@@ @@ -111,40 +111,37 @@ coffeeElementSetup(class TimelineEditor @@
     selection: {type: Object, notify: true}
   @getter_observers: [
     '_onSong(playerSong, followPlayerSong)',
     '_onGraph(graph)',
     '_onSongDuration(songDuration, viewState)',
     '_onSongTime(songTime, viewState)',
     '_onSetAdjuster(setAdjuster)',
+  ]
   constructor: ->
     super()
     @viewState = new ViewState()
     window.viewState = @viewState
   ready: ->
     super.ready()
     ko.options.deferUpdates = true;
     @dia = @$.dia
     @selection = {hover: ko.observable(null), selected: ko.observable([])}
     window.debug_zoomOrLayoutChangedCount = 0
     window.debug_adjUpdateDisplay = 0
     @viewState = new ViewState()
     window.viewState = @viewState
     @setAdjuster = (adjId, makeAdjustable) =>
       ac = @$.adjustersCanvas
       setTimeout((()=>ac.setAdjuster(adjId, makeAdjustable)),10)
     ko.computed(@zoomOrLayoutChanged.bind(@))
     @trackMouse()
     @bindKeys()
-    @bindWheelZoom(@dia)
+    @bindWheelZoom(@$.adjustersCanvas)
     @forwardMouseEventsToAdjustersCanvas()
     @makeZoomAdjs()
     setInterval(@updateDebugSummary.bind(@), 100)
     @addEventListener('iron-resize', @_onIronResize.bind(@))
     Polymer.RenderStatus.afterNextRender(this, @_onIronResize.bind(@))
     #zoomed = @$.zoomed
@@ @@ -169,12 +166,15 @@ coffeeElementSetup(class TimelineEditor @@
   _onSong: (s) ->
     @song = @playerSong if @followPlayerSong
   _onGraph: (graph) ->
     @project = new Project(graph)
   _onSetAdjuster: () ->
     @makeZoomAdjs()
   updateDebugSummary: ->
     elemCount = (tag) -> document.getElementsByTagName(tag).length
     @debug = "#{window.debug_zoomOrLayoutChangedCount} layout change,
      #{elemCount('light9-timeline-note')} notes,
      #{@selection.selected().length} selected
      #{elemCount('light9-timeline-graph-row')} rows,
@@ @@ -217,18 +217,12 @@ coffeeElementSetup(class TimelineEditor @@
       @$.vidrefLastSent = now
   bindWheelZoom: (elem) ->
     elem.addEventListener 'mousewheel', (ev) =>
       @viewState.onMouseWheel(ev.deltaY)
   forwardMouseEventsToAdjustersCanvas: ->
     ac = @$.adjustersCanvas
     @addEventListener('mousedown', ac.onDown.bind(ac))
     @addEventListener('mousemove', ac.onMove.bind(ac))
     @addEventListener('mouseup', ac.onUp.bind(ac))
   bindKeys: ->
     shortcut.add "Ctrl+P", (ev) =>
       @$.music.seekPlayOrPause(@viewState.latestMouseTime())
     shortcut.add "Ctrl+Escape", => @viewState.frameAll()
     shortcut.add "Shift+Escape", => @viewState.frameToEnd()
     shortcut.add "Escape", => @viewState.frameCursor()
@@ @@ -272,13 +266,13 @@ coffeeElementSetup(class TimelineEditor @@
     @setAdjuster('zoom-pan', => new AdjustableFloatObservable({
       observable: panObs
       emptyBox: true
       # fullzoom is not right- the sides shouldn't be able to go
       # offscreen
       getTarget: () => $V([@fullZoomX(panObs()), yMid()])
+      getTarget: () => $V([@viewState.fullZoomX(panObs()), yMid()])
       getSuggestedTargetOffset: () => $V([0, 0])
       getValueForPos: valForPos
       }))
+)

0 comments (0 inline, 0 general)