more font fixes.

This commit is contained in:
Bryce Covert
2016-02-24 13:52:36 -08:00
parent 1619f651c5
commit 8c5d719832
4 changed files with 104 additions and 101 deletions

View File

@@ -24,9 +24,11 @@
maximum-x (- 1280 margin-width)
label-width (label! talk :get-width)
label-right (+ (:x talk) label-width)
talk (cond (> label-right maximum-x) (assoc talk :x (- maximum-x label-width))
(< (:x talk) minimum-x) (assoc talk :x minimum-x)
:else talk)]
y (min (- 900 (label! talk :get-height)) (:y talk))
talk (assoc (cond (> label-right maximum-x) (assoc talk :x (- maximum-x label-width))
(< (:x talk) minimum-x) (assoc talk :x minimum-x)
:else talk)
:y y)]
(doto talk
(label! :set-x (:x talk))
(label! :set-y (:y talk)))))
@@ -72,7 +74,7 @@
(assoc :source-x source-x :source-y source-y)
(doto
(label! :set-wrap true)
(#(label! % :set-width (min 700 (+ 50 (* scale (label! % :get-width))))))
(#(label! % :set-width (min 700 (+ 50 (label! % :get-width)))))
))
x (- x (/ (label! talk :get-width) 2))
talk (assoc talk :x x :y y :id id)

View File

@@ -131,6 +131,7 @@
(defn button-style []
(let [style (skin! (skin "ui/ui.json") :get TextButton$TextButtonStyle)
tx (-> style .font .getRegion .getTexture)]
(-> style .font (.setScale 0.5 0.5))
(call! ^Texture tx :set-filter Texture$TextureFilter/Linear Texture$TextureFilter/Linear)
style))