From 9b9b45a70c1c5f088f62c5649a079484e561e4f7 Mon Sep 17 00:00:00 2001 From: Bryce Covert Date: Wed, 24 Feb 2016 11:47:41 -0800 Subject: [PATCH] Updating labels on title. --- .../src-common/advent/screens/inventory.clj | 4 +++- desktop/src-common/advent/screens/title.clj | 18 ++++++++++++++---- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/desktop/src-common/advent/screens/inventory.clj b/desktop/src-common/advent/screens/inventory.clj index e601d1ff..c95a6111 100644 --- a/desktop/src-common/advent/screens/inventory.clj +++ b/desktop/src-common/advent/screens/inventory.clj @@ -95,7 +95,9 @@ (map #(assoc % :opacity opacity) i))))] (when (:shown? entities) - (doto (:highlighted-text entities) (label! :set-color (color 1 1 1 opacity))) + (doto (:highlighted-text entities) + (label! :set-color (color 1 1 1 opacity)) + (label! :set-font-scale 0.5)) (render! screen [(:fade entities) (:overlay entities)]) (render! screen (:items entities)) (if-let [item (:highlighted-item entities)] diff --git a/desktop/src-common/advent/screens/title.clj b/desktop/src-common/advent/screens/title.clj index 999023ac..27d13eaa 100644 --- a/desktop/src-common/advent/screens/title.clj +++ b/desktop/src-common/advent/screens/title.clj @@ -19,6 +19,7 @@ ) (:import [com.badlogic.gdx.graphics Pixmap Pixmap$Filter Texture Texture$TextureFilter Color] [com.badlogic.gdx.graphics.g2d TextureRegion] + [play_clj.entities NinePatchEntity] [com.badlogic.gdx.utils.viewport FitViewport] [com.badlogic.gdx.scenes.scene2d.ui Slider$SliderStyle Widget ButtonGroup TextButton$TextButtonStyle] [com.badlogic.gdx.scenes.scene2d Group Actor] @@ -148,12 +149,21 @@ ([msg] (make-label msg nil)) ([msg col] - (let [font (utils/get-font "ego/font.fnt")] + (let [font (utils/get-font "ego/font.fnt") + + p (NinePatchEntity. (skin! (skin "ui/ui.json") :get-patch "ui-bg")) + _ (nine-patch! p :set-padding 0 0 0 0) + bg (drawable :nine-patch (:object p)) + style (style :label font (or col (color 1.0 0.3 0.3 1.0))) + _ (bitmap-font! font :set-markup-enabled true) + #_#__ (set! (.background style) bg)] (-> msg - (label (style :label font (or col (color 1.0 0.3 0.3 1.0)))) + (label style) (assoc :x 0 :y 0 :height 40 :origin-x 0 :origin-y 0 :z 8) - center - (doto (label! :set-alignment Align/bottom)))))) + (doto (label! :set-alignment Align/bottom) + (label! :set-font-scale 0.5) + (#(label! % :set-width (/ (label! % :get-width) 2)))) + center)))) (defn make-slider [initial-value & rest] (let [ui-skin (skin "ui/ui.json")