ui tweaks

desktop/resources/ui/ui.atlas

@@ -6,7 +6,7 @@ filter: Nearest,Nearest
 repeat: none
 button
   rotate: false
-  xy: 2, 2
+  xy: 2, 6
   size: 52, 52
   split: 24, 24, 12, 22
   orig: 52, 52
@@ -14,7 +14,7 @@ button
   index: -1
 button.disabled
   rotate: false
-  xy: 56, 2
+  xy: 56, 6
   size: 52, 52
   split: 24, 24, 12, 22
   orig: 52, 52
@@ -22,7 +22,7 @@ button.disabled
   index: -1
 button.hover
   rotate: false
-  xy: 110, 2
+  xy: 110, 6
   size: 52, 52
   split: 24, 24, 12, 22
   orig: 52, 52
@@ -30,7 +30,7 @@ button.hover
   index: -1
 button.pressed
   rotate: false
-  xy: 164, 2
+  xy: 164, 6
   size: 52, 52
   split: 24, 24, 16, 16
   orig: 52, 52
@@ -38,7 +38,7 @@ button.pressed
   index: -1
 screenshot-image-button
   rotate: false
-  xy: 292, 34
+  xy: 338, 38
   size: 20, 20
   split: 8, 8, 8, 8
   orig: 20, 20
@@ -46,7 +46,7 @@ screenshot-image-button
   index: -1
 screenshot-image-button-active
   rotate: false
-  xy: 270, 34
+  xy: 316, 38
   size: 20, 20
   split: 8, 8, 8, 8
   orig: 20, 20
@@ -54,7 +54,7 @@ screenshot-image-button-active
   index: -1
 scroll-slider
   rotate: false
-  xy: 218, 6
+  xy: 264, 10
   size: 20, 48
   split: 8, 8, 12, 12
   orig: 20, 48
@@ -62,7 +62,7 @@ scroll-slider
   index: -1
 slider
   rotate: false
-  xy: 314, 34
+  xy: 360, 38
   size: 20, 20
   split: 8, 8, 8, 8
   orig: 20, 20
@@ -70,15 +70,23 @@ slider
   index: -1
 slider-bar
   rotate: false
-  xy: 240, 26
+  xy: 286, 30
   size: 28, 28
   orig: 28, 28
   offset: 0, 0
   index: -1
 slider-bar-hover
   rotate: false
-  xy: 240, 26
+  xy: 286, 30
   size: 28, 28
   orig: 28, 28
   offset: 0, 0
   index: -1
+ui-bg
+  rotate: false
+  xy: 218, 2
+  size: 44, 56
+  split: 20, 21, 16, 16
+  orig: 44, 56
+  offset: 0, 0
+  index: -1

desktop/src-common/advent/screens/title.clj

@@ -169,11 +169,10 @@
 (defn make-table [children]
   (-> children
       (table)
-      (doto (table! :background (NinePatchDrawable.
-                                 (:object (nine-patch {:region (:object (utils/get-texture "talk-bg-2.png")) :left 9 :top 9 :right 9 :bottom 9})))))
+      (doto (table! :set-background (NinePatchDrawable. (skin! (skin "ui/ui.json") :get-patch "ui-bg" ))))
       (assoc 
-          :y 32 :width 500 :height 335
-          :x (- (/ 1280 2) (/ 500 2))
+          :y 32 :width 504 :height 335
+          :x (- (/ 1280 2) (/ 504 2))
           :z 8
           :opacity 1.0)))
 
@@ -212,7 +211,7 @@
     
     (make-table [[(doto (scroll-pane chapter-table
                                       (skin "ui/ui.json"))
-                     (scroll-pane! :set-fade-scroll-bars false)) :height 240 :width 476]
+                     (scroll-pane! :set-fade-scroll-bars false)) :height 240 :width 472]
                  :row
                  [ (make-button "Back" :key :back) :height 56]])))
 
@@ -254,7 +253,7 @@
                 (.setMinCheckCount 0)
                 (.setUncheckLast true))
         [cell-w cell-h] [218 161]
-        make-cell (fn [image] [image :width cell-w :pad 4 4 4 4 :height cell-h])
+        make-cell (fn [image] [image :width cell-w :pad 4 4 0 0 :height cell-h])
         make-save-screenshot (fn [{:keys [screenshot name id state blurb] :as save}]
                                (let [btn (doto (assoc (image-button (skin "ui/ui.json"))
                                                  :save save
@@ -281,7 +280,7 @@
                       (scroll-pane! :set-fade-scroll-bars false))]
     (.setScrollFocus stage (:object scroll-pane))
     [scroll-pane
-     :colspan 3 :height 212 :pad-bottom 4 :width 476]))
+     :colspan 3 :height 212 :pad-bottom 4 :width 472]))
 
 (defn saves-menu [entities stage]
   (let [save-label (make-label "" label-color)