From 8ba6984860ef747f81aea6b844ef0db5beb6a0eb Mon Sep 17 00:00:00 2001
From: Bryce Covert <bryce@liffft.com>
Date: Wed, 11 Nov 2015 13:18:42 -0800
Subject: [PATCH] much better buttons.

---
 desktop/resources/ui/button.9.png           | Bin 1353 -> 1504 bytes
 desktop/resources/ui/button.pressed.9.png   | Bin 1315 -> 1482 bytes
 desktop/resources/ui/ui.atlas               |  44 +++++++++++++-------
 desktop/resources/ui/ui.json                |  10 ++---
 desktop/resources/ui/ui.png                 | Bin 985 -> 1789 bytes
 desktop/src-common/advent/screens/title.clj |   2 +-
 6 files changed, 36 insertions(+), 20 deletions(-)

diff --git a/desktop/resources/ui/button.9.png b/desktop/resources/ui/button.9.png
index 58f31b33afd2a58a074bfdce09be41fef1d62f6f..f5857806e74ea8e04dafae779ca167af32f4ef31 100644
GIT binary patch
delta 473
zcmV;~0Ve**3g8Qn7Ya5A1^@s6j74hQu_6Bhf2&DEK~!i3V`QKY_>X1{BO0ITT&xxp
zda9y3gz6Sk)4=}iw=w*|L`@3@lUbu48%(i5j9b8IlTe-t%NIj2>(Oy36h5sva+c3f
ztXMVi6$&4n1IlxwNfA9%20MS)#uy8>kVnr`Q?pc1l=;SfL*dh!gKmHJG*lb0<+))S
ze`BK_Lyi2w&jaN#jCLV<Jw@+4g&u6^_M^LxfdR8#8@5RiYpMA6A4Vji2jZaTkE|H`
z_wV1Jj}bx+9JVnw>M=r5KiK54mWqG=j+TmpEu!G=8O>wxpco<y9C>WC9vigrH=4%=
zZPeg!*l3L52$(@D42m&~nTkQ{S`r*Kf0`6Y2&_S&bTq~WMKqA$h+!LJSlf!)&Tmk{
z27T<@A@~D|Jgqqg)(W6lkv;7W3jgXA6fT%EY-4QHW0;XWxJAHu?AnX(D6Twr@e>Lk
zBTerWL6N652i<;j_o2HV<et%_Nb6Xkw)w+0#=tFmcS9Mx1BqG^oYW3bip;~7L#L1p
z+<E@V=sFMN02vbO;ho3OqkvGJLsvi0d{CZ3cf+uau~CnqNA)OwfI<KOzeG>pHLNfP
P00000NkvXXu0mjf#X;EQ

delta 321
zcmV-H0lxm=3&{$Q7YZr}1^@s6_)(}mu_6Bhe-ueXK~!i3?N~7m!Y~Y^h-a{}!-Dt$
z;yJv8=OBK7SYTpdW#9*lK)cm;+DJ*GtGRATQ~P{(u3A@<GS^3>sl+<_(oC@5EhLca
ziE{=#93QHVY0d;lu~-<A8ZlTJZ}#=nX1$DwRqV|9a_h`h_Z+R*NfF>pw~EayvSm;8
ze|g%9G2~thKDUaoupzBAMC@9zQGFN2l0YlQGKF%^wPNaD28Hz$9Ih2hAqMtYDh4Y}
z02mbu5CgkS#bBig0Hb07Vqmx3D%Q+A?yq;7c`>(>Glurz@+&!mQTTt5+$zSx${Q{%
zqd8Ypo)tZpmNNZmh0h2{D;lIgZ@E>>E1Y+1SMyQL8c)}!s>7{fEDZWh@lW8sms==Z
TtuqFx00000NkvXXu0mjftK5;B

diff --git a/desktop/resources/ui/button.pressed.9.png b/desktop/resources/ui/button.pressed.9.png
index 4aecb2382503dffc66503219536269afc12973dc..ba8a87cf2b2852a5bfa2becaeadf526f196723cf 100644
GIT binary patch
delta 452
zcmV;#0XzPq3d#$R7Ya5A1^@s6j74hQu_68ge*u+AL_t(&1!H8O5BQH}4I>(Vlsg&%
zqaiTFLI7(fF7#AI&+LQRTm9Q_!~FqrJBZITs9j8f<3>G3LEsIDR&d%Rl&8Y-#ZVk~
z`+zVCpVk~zhqowJteW@=g^$h|&12{xG8Fj3w(wxV7W(LUYHF4WiZZvb_b7Z?bI|S2
zf1ZYFBepy@Y-4QHW2lio_<5i_hS4rWuczppr_h59-F|fUF)(1(Yr{4vVl5T_{=<kw
z^gtZ+{E-!7|3_nN@TSONn-qtw$FP=)e@64zXda_`2#l;e_V@2Ux`!~eEgZHnHtI2I
zCly+oHyUHK4q<AWKN@4y4pCa02Z}NHf7}wSEu*LTqe+pTp-m0DhHZ>t?T;CFenJT}
z^s#emU(9hl6b)479NmmMKbJl24vG!8ZXvkWUVI00hHZ?EdJGZSLxTm*W3Y4ybMm>1
zsCf)MO<&l~2UAKH8r^<$_o2HV<fzf4NSCOgq9wyN#;~>%-3?_>rdzZmIH?$xE|eRE
uo~L%6e}dtUVH;zk9-}+~jhaA}5C8ym_fj*n8KCC?0000<MNUMnLSTXyGtYGZ

delta 284
zcmV+%0ptG43!@5<7YZr}1^@s6_)(}mu_68ge*o@DL_t(&1?^Zt4#F@DV`yLD&I$2_
zJ%^X@9KL`!apy6h?dT<}Qt9Fa@0N639Xpn~bh~w)HyqPJtWXSyfsHX>n)ost(CpM@
zU2m^h9eZlT72s4@1$iM`r`}xh)cJG_0p}fhe>}aVDL;Bnt@xE9!o{?T^%mLasimH_
zf4<Q&SAs9CVk)d<Yqj|HsMx0Ng{35@6-$|7c`vnMvws;D)@yL2R;-2?+PzYYRvHJG
z6my87O-nIaX&hiu%prz0omMgPo``csoH0bpgfke;?xPj?#rgl`F=PxqhwE#{mZuOy
iTE$ctO077Efe+~@9!QI<LB{|9002ov22Mn-LSTYju!0T%

diff --git a/desktop/resources/ui/ui.atlas b/desktop/resources/ui/ui.atlas
index 39b72533..c8899a87 100644
--- a/desktop/resources/ui/ui.atlas
+++ b/desktop/resources/ui/ui.atlas
@@ -1,28 +1,44 @@
 
 ui.png
-size: 256,64
+size: 512,64
 format: RGBA8888
 filter: Nearest,Nearest
 repeat: none
 button
   rotate: false
   xy: 2, 2
-  size: 52, 40
-  split: 24, 24, 12, 24
-  orig: 52, 40
+  size: 52, 52
+  split: 24, 24, 12, 22
+  orig: 52, 52
+  offset: 0, 0
+  index: -1
+button.disabled
+  rotate: false
+  xy: 56, 2
+  size: 52, 52
+  split: 24, 24, 12, 22
+  orig: 52, 52
+  offset: 0, 0
+  index: -1
+button.hover
+  rotate: false
+  xy: 110, 2
+  size: 52, 52
+  split: 24, 24, 12, 22
+  orig: 52, 52
   offset: 0, 0
   index: -1
 button.pressed
   rotate: false
-  xy: 56, 2
-  size: 52, 40
-  split: 24, 24, 16, 20
-  orig: 52, 40
+  xy: 164, 2
+  size: 52, 52
+  split: 24, 24, 16, 16
+  orig: 52, 52
   offset: 0, 0
   index: -1
 screenshot-image-button
   rotate: false
-  xy: 162, 22
+  xy: 248, 34
   size: 20, 20
   split: 8, 8, 8, 8
   orig: 20, 20
@@ -30,7 +46,7 @@ screenshot-image-button
   index: -1
 screenshot-image-button-active
   rotate: false
-  xy: 140, 22
+  xy: 218, 4
   size: 20, 20
   split: 8, 8, 8, 8
   orig: 20, 20
@@ -38,7 +54,7 @@ screenshot-image-button-active
   index: -1
 scroll-slider
   rotate: false
-  xy: 184, 22
+  xy: 270, 34
   size: 20, 20
   split: 8, 8, 8, 8
   orig: 20, 20
@@ -46,7 +62,7 @@ scroll-slider
   index: -1
 slider
   rotate: false
-  xy: 206, 22
+  xy: 292, 34
   size: 20, 20
   split: 8, 8, 8, 8
   orig: 20, 20
@@ -54,14 +70,14 @@ slider
   index: -1
 slider-bar
   rotate: false
-  xy: 110, 14
+  xy: 218, 26
   size: 28, 28
   orig: 28, 28
   offset: 0, 0
   index: -1
 slider-bar-hover
   rotate: false
-  xy: 110, 14
+  xy: 218, 26
   size: 28, 28
   orig: 28, 28
   offset: 0, 0
diff --git a/desktop/resources/ui/ui.json b/desktop/resources/ui/ui.json
index feaca2cc..aa84e573 100644
--- a/desktop/resources/ui/ui.json
+++ b/desktop/resources/ui/ui.json
@@ -1,10 +1,10 @@
 {
   com.badlogic.gdx.graphics.g2d.BitmapFont: { default-font: { file: ego/font.fnt }, button-font: { file: ego/button-font.fnt }}
   com.badlogic.gdx.graphics.Color: {
-    button-font-up: {hex: A97F55FF },
-    gray: { a: 1, b: 0.5, g: 0.5, r: 0.5},
-    pressed: { hex: A97F55FF  },
-    yellow: {hex: A97F55FF},
+    button-font-up: {hex: 19003Dff },
+    gray: {hex: 21172Eff }, 
+    pressed: { hex: 19003Dff  },
+    yellow: {hex: 69386Dff },
   },
 com.badlogic.gdx.scenes.scene2d.ui.Slider$SliderStyle: {
 	default-horizontal: { background: slider, knob: slider-bar }
@@ -22,7 +22,7 @@ com.badlogic.gdx.scenes.scene2d.ui.ImageButton$ImageButtonStyle: {
 
 
 com.badlogic.gdx.scenes.scene2d.ui.TextButton$TextButtonStyle: {
-  default: { font: button-font, down: button.pressed, up: button, fontColor: button-font-up, overFontColor: yellow, unpressedOffsetY: 0, pressedOffsetY: -4, downFontColor: pressed, disabledFontColor: gray}
+  default: { font: button-font, disabled: button.disabled, down: button.pressed, over: button.hover, up: button, fontColor: button-font-up, overFontColor: yellow, unpressedOffsetY: 0, pressedOffsetY: -4, downFontColor: pressed, disabledFontColor: gray}
 }
 
 
diff --git a/desktop/resources/ui/ui.png b/desktop/resources/ui/ui.png
index 1233f6761539c0f260a10543540e40a90f6a21bf..6102ea8da984b75a6e4f0744ffc97bb81d9ab0c1 100644
GIT binary patch
literal 1789
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
N^vyfHFK^s)><{t8<z@f?

literal 985
zcmeAS@N?(olHy`uVBq!ia0y~yU<5K595~p3<k#4h`xqFQ7kIijhE&{oJJ&v2#8IMs
zxwx*0l7~u$Nx>raiv<T8*v&YFTmt;EHyR}AnDn+LbY;Ab<Y<c0XxiBEh<(H6lk6Ue
znaPSuFLgq$%`Ps#Df_)F{d?K@nKz#|#+PpYtbXVBhWC?Z3p+i$c2hZwouLir00jog
z^P3bH7+4q>Qty0<)@*RpWn9b4z~sQd;F|aI{+-tnQ}@6{N`)F;LnWVbEpRy4Ya;b}
zwQDwW1A_nqNQ={-y03XFKr9Xhfri;k1*!2;OdpEa7!?>;8i3waV8~`!aPQFns-1xm
z3=^|6IRzM)HUu*Kb*kGpFPh<>DF;Z2H>-g5i}~MoZ>*WQU!eP!l`bO_$ULA7OTw>x
z*VfMw-@EAVZ1?k8!VNOkGtxgl<Ndf~v%<Qq>T6FFCC}esyUqE|%i3e7dt`$9Vz2HJ
zWMDdRCp_X$UEP{eZ}A41;JL@AJ>m~4`^dhs=q%9G7hDQk4_w`2U!^o{&G*%h-B}(?
zopb8gSMF=tmQ(-90^J9*8{|hOj~my&zt&b3Z<r$tcF%!*cJp_uY+Lqx&z2Re>+PNd
z$Dfz-KR5Hs!T(#XMx7OoWz5mp8vfZOoZ+_RV(o_Q-ph+w85J51{eC5yqR5z2|M!}|
zAma&3!G>n0h<WxsARAV!W>`1R@=AYp>!bH4JsES%(%tVdL6p3hGwVfqV%44QW80dI
zuY5giyHl%y|9DzU)B*X~Yp>Ycu@v*Z_WSC`r*k+Q;u$uxe?OA6hC$3<Zo<*`a~Ph?
zixG8Lui&o7V5!bj5WrCPQJH}S>?N@ORE}(MIvJJk!jSkbE{E&(k!R~I#o`$f<NSR%
zw;mAYvM_!1waBMbj^)7vXNT#m1(kX=0vcgr%eTDa;IR?4*j4s%!Ce9W^uBi2pGh@A
zV)ZYXCM2KQ*j#xniWg|f8=(fDd-WAYfee}L4Zn`YcQT|fv59IiK|_|EWx=t{I-S2g
z1RP!&H~ycyWL|tQL!#XKd-_6LR;K?<|EqX2)JUHAq|bacl%aVZ=Zp{82QJRDU(c{>
z_cyhBf*C4Rx=bs&8M?NyEaOVJq3<~JQ}F{=$tyxHI258jXh9NA14EVygLbe3gWEC|
wMv<;I1`ClZOPw8oiK8HpL57=;fjFS{nf-Z_VRrJnsSY3wp00i_>zopr0Q6RGG5`Po

diff --git a/desktop/src-common/advent/screens/title.clj b/desktop/src-common/advent/screens/title.clj
index 6ee992a6..0006b32b 100644
--- a/desktop/src-common/advent/screens/title.clj
+++ b/desktop/src-common/advent/screens/title.clj
@@ -127,7 +127,7 @@
 (defn button-style []
   (let [style (skin! (skin "ui/ui.json") :get TextButton$TextButtonStyle)
         tx (-> style .font .getRegion .getTexture)]
-    #_(call! ^Texture tx :set-filter Texture$TextureFilter/Linear Texture$TextureFilter/Linear)
+    (call! ^Texture tx :set-filter Texture$TextureFilter/Linear Texture$TextureFilter/Linear)
     style))
 
 (defn save-object [a]