From 9cc2097ac1e5d107816b1330987c541967d6fe37 Mon Sep 17 00:00:00 2001
From: William Toohey <will@mon.im>
Date: Thu, 4 Feb 2016 18:19:56 +1000
Subject: [PATCH] Move seek buttons

---
 fonts/HuesExtra.eot     | Bin 2840 -> 2956 bytes
 fonts/HuesExtra.svg     |   2 ++
 fonts/HuesExtra.ttf     | Bin 2676 -> 2792 bytes
 fonts/HuesExtra.woff    | Bin 2752 -> 2868 bytes
 src/css/hues-editor.css |   1 +
 src/js/HuesEditor.js    |  55 +++++++++++++++++++++++-----------------
 6 files changed, 35 insertions(+), 23 deletions(-)

diff --git a/fonts/HuesExtra.eot b/fonts/HuesExtra.eot
index a5635feba0c11927758e9cb0c89ad48b76b00e29..f39aeb891ed24265b3c22fec73b09ee0e281f01f 100644
GIT binary patch
delta 386
zcmbOs)+5f^!_C0(Vj`<K%lh>nnkOf6icAbi5@KU#U|`q-#0kl{i3Q?emnKg<Aye;q
z;7tev17igP1KX2~)Wj5yy<6KE7&u~p>dZ2L0_+=@F9G>efP9sV+>#2*JeJ=;{th7D
zB_}^Qk#`&a8X*4<NIo~QqJTk)VKoB-rvi|#ke8U7I@602sGidSXh&N?esKu{Gf;+s
z>jX%ifti`{;^Y)Ydq$qgOBlTwc{YDwT+LSBz~I2#!0f;P^n|&fu^=N9HZ(9gFgpA@
z@b7>FGsC|HASR>3U$796y#Qn^BO?QY1JePZUZ7u9VR{)FKx!Qzn!p-Bih)W&p!vi4
z_3`{RUm3Vr!2C-$xOTLHSeI_>Xq~)=!<<oY@)r&p4xnrU3sBQ!15O1I<{0K8umOS$
UD;YSz`j{p&atm)R=3L4M08pP{?EnA(

delta 250
zcmeAXpCQI7!Og%>GLhAs#lMK5aH2z*5bIwC28KOAoRFNGSRfvDY2w5aGWAjOc33em
zFjg=yu+?OwCZ=#~<L6~yVE+PCXO;mJVBf%efq{WT2gp~+$StWb%ww(w@&kZ;o1FaQ
zM6M_vpni@XAYUOjv7&%Mf?+j~zXrt5OUzB3>BadQ$Ug(LqpcvnxP*ZjD8s-N0+MH7
zW@bD&Ifc=lk!$i2MsG&0%^w(7vnhfUFcdNr`N#9yd}ZKf0rM|idFlaTfau98oaT)D
YlVdn-CNJPrU}Ineit}$i#d(Mk01;$7KL7v#

diff --git a/fonts/HuesExtra.svg b/fonts/HuesExtra.svg
index 4ebd281..16637be 100644
--- a/fonts/HuesExtra.svg
+++ b/fonts/HuesExtra.svg
@@ -18,4 +18,6 @@
 <glyph unicode="&#xe908;" glyph-name="menu" d="M128 682.667h768v-86h-768v86zM128 384.667v84h768v-84h-768zM128 170.667v86h768v-86h-768z" />
 <glyph unicode="&#xe909;" glyph-name="backward2" d="M576 800v-320l320 320v-704l-320 320v-320l-352 352z" />
 <glyph unicode="&#xe90a;" glyph-name="forward3" d="M512 96v320l-320-320v704l320-320v320l352-352z" />
+<glyph unicode="&#xe90b;" glyph-name="first" d="M128 64v768h128v-352l320 320v-320l320 320v-704l-320 320v-320l-320 320v-352z" />
+<glyph unicode="&#xe90c;" glyph-name="previous2" d="M256 64v768h128v-352l320 320v-704l-320 320v-352z" />
 </font></defs></svg>
\ No newline at end of file
diff --git a/fonts/HuesExtra.ttf b/fonts/HuesExtra.ttf
index 946e462edd8248a4358348f198bcc11523190ab6..2b3a8438d6c5ce8baff25820b9b9053475d0961e 100644
GIT binary patch
delta 405
zcmew&@<OzpfsuiMft#U$ftkU;KUm+0Ux<wzD6$8L6OwZi3&g`NO=e(VlmYTX(i4jd
zfV2RR5288Jb1KtZ54;Hh@+%k^*q&shCZ=%g-P#V6iUG=-WdH@(H!xoU@}~g#DjB&Y
z6_$A{zk&Q6K)y>(ezIdC?>7E5K!HCX1-Xe81q@OQs~H$L6@Yw&yu{qpnO>Yg4V(@@
zOWF$Zi%WnG1p=-UAbAF6=8F>#*fa7>V)SO@+3dr(nytQp!GXDf*#YP$26I7UK}INS
zXkc_;boh7R-vI|^hJOn{Oh$*lU?CuT0mw{7U{E+P9RTVDhJY$eFGB-Jtph|8SOZ8g
zP$>vBe^|dhp5Nvx12+qpf9VF-j#d!s(v2OhlO;IJ83iW?aM*AFWgA$4nkM&fD2On}
aFc*Oh5M)@%zya3BG&zw=c=LIVrHladc3$%U

delta 287
zcmaDM`bDIkfsuiMft#U$ftkU;KUm+0Ux@WDP-G7fCnV=47Kn#kn#jPwC<Ek&q$d^^
z0BHdrA4GGc=TxRe&D&uG<X12-u+?OwCZ=#~<L6~yVE+P?H_HGDuy0_#092|2<f~-l
zmQ)z#F;@fm0YJV@PJXguB3Bd-&;X7epnyVdVnqRi1jA||e+`JAmzbM6(~I*rkbeef
zNn1gFaS70&K)@9Ol4oFMJ~{D#JtNm7MsG&0%|48)*%U#t4229u{_*@aUm3Vr!2C;B
uo_c^7AbN5GhdCqv<Q*I~lmBoi2!I2CpJ62f2UsQ3<cnOwo1HnAG6DckAwRnS

diff --git a/fonts/HuesExtra.woff b/fonts/HuesExtra.woff
index 8a52469887ffcfc85f68b0705f515a7cd61f35a0..09af186c369cb75ce83f8d461ae841ed124e0595 100644
GIT binary patch
delta 431
zcmX>gx<yQ++~3WOfsp|SxJ?+iK{VHki6UC{Z0yOoi3JP{j2S?o5D*p*yEHjHu^1$_
z2gv7uVuAFW$~2(Z5e5dfCm`&4;7v$IYGMjd$qJwvGZ5z3yR|(7C<qjL0OYHHF#87P
zOBuN(6$}iVEI_^s2wUc{{LaZwPGs<B;Pikg<lV-<CO5GHXfbCFP)q@gr5IM{CFZ6A
z#d?62w}J3XFV5cu`NbtbuZY0aF#}o5%oiu~FxoTnO!i^)X5`sCgK;%meFK97a|5#j
z$j|12#)6Dc*wDb}!07Prz`p|y%nbh)fS8O9f5AdP_5z@342;0wa$q_D)XUDmpbFE=
z&;U~F0MP{208$K83Ifd^)~}D}xB1Gz4e}}j!=)QsJ6a)(9j%j7ILsLZC(q%q;Q-1u
ZumCkpzQLiu#T>(21U5i$^FNM5i~!xWVIlwk

delta 335
zcmdlYc0g35+~3WOfsp|SxDGIIgXxmVirm7J4Y*k*Y75u1{!PwJEMQ<@%mB)TfUtPj
zrHSc@#UQagKt2Z)3#8{%rUAu{Ffg#yfN<2j9ab5si77xO4nQ?#Ak49ipEm<22o$RT
z@>M{XeFO7_jNB3+pJNV?Zv(=HdCb*0`N@e4{tO&9fC362%oW9Bm77=rw3y=uOpHN-
zVRc?&ZYl!<rv%XQHV~fa#reA+zqkbGr3G+x%s>`1^U29PjP{INlYJPy8M!vkU|h|n
z2oz^vC}b$|kLS1f%D~M6=3lz<)C0r-(UZ?`m^1QEX5qA%?7^uZ01hmEhLvECGcYiL
L0&8<W=Tb%h3!+0&

diff --git a/src/css/hues-editor.css b/src/css/hues-editor.css
index 70f57c5..6076124 100644
--- a/src/css/hues-editor.css
+++ b/src/css/hues-editor.css
@@ -114,6 +114,7 @@
 
 .beat-count {
     font-size: 10px;
+    margin-left: 4px;
 }
 
 .edit-area-right-header {
diff --git a/src/js/HuesEditor.js b/src/js/HuesEditor.js
index e33e0b3..9c7af25 100644
--- a/src/js/HuesEditor.js
+++ b/src/js/HuesEditor.js
@@ -356,22 +356,22 @@ HuesEditor.prototype.updateInfo = function() {
     this.beatLen.textContent = beatLen.toFixed(2);
     
     // Avoid a bunch of nested elses
-    this.seekStart.className = "hues-button disabled";
-    this.seekLoop.className = "hues-button disabled";
-    this.saveBtn.className = "hues-button disabled";
-    this.copyBtn.className = "hues-button disabled";
-    this.buildEdit._removeBtn.className = "hues-button disabled";
-    this.loopEdit._removeBtn.className = "hues-button disabled";
+    this.seekStart.classList.add("disabled");
+    this.seekLoop.classList.add("disabled");
+    this.saveBtn.classList.add("disabled");
+    this.copyBtn.classList.add("disabled");
+    this.buildEdit._removeBtn.classList.add("disabled");
+    this.loopEdit._removeBtn.classList.add("disabled");
     
     if(this.song) {
-        this.saveBtn.className = "hues-button";
-        this.copyBtn.className = "hues-button";
+        this.saveBtn.classList.remove("disabled");
+        this.copyBtn.classList.remove("disabled");
         if(this.song.sound) {
-            this.seekLoop.className = "hues-button";
-            this.loopEdit._removeBtn.className = "hues-button";
+            this.seekLoop.classList.remove("disabled");
+            this.loopEdit._removeBtn.classList.remove("disabled");
             if(this.song.buildup) {
-                this.seekStart.className = "hues-button";
-                this.buildEdit._removeBtn.className = "hues-button";
+                this.seekStart.classList.remove("disabled");
+                this.buildEdit._removeBtn.classList.remove("disabled");
             }
         }
     }
@@ -507,7 +507,14 @@ HuesEditor.prototype.uiCreateEditArea = function() {
     this.timeLock.className = "hues-icon";
     // CHAIN, use &#xe904; for CHAIN-BROKEN
     this.createButton("&#xe905;", this.timeLock)
-    this.buildEdit = this.uiCreateSingleEditor("Buildup&nbsp;", "buildup", "buildupRhythm", "edit-build", editArea);
+    
+    this.buildEdit = this.uiCreateSingleEditor("Buildup", "buildup", "buildupRhythm", "edit-build", editArea);
+    this.seekStart = this.buildEdit._seek;
+    // FIRST |<<
+    this.seekStart.innerHTML = "&#xe90b;";
+    this.seekStart.onclick = () => {
+        this.core.soundManager.seek(-this.core.soundManager.buildLength);
+    };
     
     // drag handle
     var handleContainer = document.createElement("div");
@@ -539,7 +546,13 @@ HuesEditor.prototype.uiCreateEditArea = function() {
         document.addEventListener("mouseup", mouseup);
     });
 
-    this.loopEdit = this.uiCreateSingleEditor("Rhythm&nbsp;&nbsp;", "sound", "rhythm", "edit-loop", editArea);
+    this.loopEdit = this.uiCreateSingleEditor("Rhythm&nbsp;", "sound", "rhythm", "edit-loop", editArea);
+    this.seekLoop = this.loopEdit._seek;
+    // BACK |<
+    this.seekLoop.innerHTML = "&#xe90c;";
+    this.seekLoop.onclick = () => {
+        this.core.soundManager.seek(0);
+    };
     
     this.buildEdit._hilight.textContent = "[none]";
     this.loopEdit._hilight.innerHTML = 
@@ -574,6 +587,11 @@ HuesEditor.prototype.uiCreateSingleEditor = function(title, soundName, rhythmNam
     var nameLabel = document.createElement("span");
     header.appendChild(nameLabel);
     nameLabel.innerHTML = title;
+    
+    var seek = this.createButton("", header, true, "hues-icon");
+    header.appendChild(seek);
+    container._seek = seek;
+    
     var beatCount = document.createElement("span");
     header.appendChild(beatCount);
     beatCount.className = "beat-count";
@@ -780,15 +798,6 @@ HuesEditor.prototype.uiCreateControls = function() {
     controls.id = "edit-controls";
     this.root.appendChild(controls);
     
-    this.seekStart = this.createButton("<< Start", controls, true);
-    this.seekStart.onclick = () => {
-        this.core.soundManager.seek(-this.core.soundManager.buildLength);
-    };
-    this.seekLoop = this.createButton("< Loop", controls, true);
-    this.seekLoop.onclick = () => {
-        this.core.soundManager.seek(0);
-    };
-    
     var playRateLab = document.createElement("span");
     playRateLab.className = "settings-individual";
     playRateLab.textContent = "1.00x";