diff --git a/desktop/src-common/advent/screens/title.clj b/desktop/src-common/advent/screens/title.clj index 73c149bd..f93e9332 100644 --- a/desktop/src-common/advent/screens/title.clj +++ b/desktop/src-common/advent/screens/title.clj @@ -117,6 +117,15 @@ center (doto (label! :set-alignment Align/center)))))) +(defn make-slider [initial-value] + (let [ui-skin (skin "ui/ui.json")] + (-> + (slider {:min 0 :max 100 :step 1} ui-skin :set-value initial-value) + (assoc :width 300 + :hover (skin! ui-skin :get "default-horizontal-hover" Slider$SliderStyle) + :default (skin! ui-skin :get "default-horizontal" Slider$SliderStyle) + :z 8)))) + (defn stack-y [label base index] (assoc label :y (- 280 (* 32 index)))) @@ -126,15 +135,7 @@ (utils/setup-viewport screen 1280 960) (utils/load-settings!) (let [font (utils/get-font "ego/font.fnt") - start-playing (-> (make-label (quest-label)) - (stack-y 280 0)) - copyright (make-label "DEMO - Copyright Bryce Covert - Not for distribution") - fullscreen (-> (make-label "Fullscreen") - (stack-y 280 5)) - quit (-> (make-label "End quest") - (stack-y 280 6)) music (utils/make-music "music/intro.ogg") - ui-skin (skin "ui/ui.json") balloon (utils/make-anim "title/balloon.png" [15 30] 0.45 (range 4))] (input! :set-cursor-image (utils/cursor "cursor.png" :hourglass) 0 0) @@ -166,39 +167,36 @@ :z 3) :particle-clouds (assoc (particle-effect "particles/particle-clouds" :reset :start) :x 640 :y 480 :z 1) :ego-jet (assoc (particle-effect "particles/jet" :reset :start) :x 450 :y 650 :z 4) - :toolbox (center (assoc (nine-patch {:region (:object (utils/get-texture "talk-bg-2.png")) :left 9 :top 9 :right 9 :bottom 9}) + + :toolbox (-> (assoc (nine-patch {:region (:object (utils/get-texture "talk-bg-2.png")) :left 9 :top 9 :right 9 :bottom 9}) :y 58 :width 500 :height 282 - :z 7)) + :z 7) + center) + :start-playing (-> (make-label (quest-label)) + (stack-y 280 0)) :music-label (-> (make-label "Music" (color :white)) (stack-y 280 1)) - :music-volume-slider (-> (slider {:min 0 :max 100 :step 1} ui-skin :set-value (:music-volume @utils/settings)) - (assoc :x (- (/ 1280 2) 150) - :width 300 - :y (- 280 (* 32 2)) - :hover (skin! ui-skin :get "default-horizontal-hover" Slider$SliderStyle) - :default (skin! ui-skin :get "default-horizontal" Slider$SliderStyle) - :z 8)) + + :music-volume-slider (-> (make-slider (:music-volume @utils/settings)) + center + (stack-y 280 2)) :sound-label (-> (make-label "FX" (color :white)) (stack-y 280 3)) - - - :sound-volume-slider (assoc (slider {:min 0 :max 100 :step 1 } ui-skin :set-value (:sound-volume @utils/settings)) - :width 300 - :x ( - (/ 1280 2) - 150) - :y (- 280 (* 32 4)) - :z 8 - :hover (skin! ui-skin :get "default-horizontal-hover" Slider$SliderStyle) - :default (skin! ui-skin :get "default-horizontal" Slider$SliderStyle)) + :sound-volume-slider (-> (make-slider (:sound-volume @utils/settings)) + center + (stack-y 280 4)) + + :fullscreen (-> (make-label "Fullscreen") + (stack-y 280 5)) + :quit (-> (make-label "End quest") + (stack-y 280 6)) + :font font :music music :volume 1.0 - :start-playing start-playing - :quit quit - :fullscreen fullscreen - :copyright copyright + :copyright (make-label "DEMO - Copyright Bryce Covert - Not for distribution") :tweens {:fade-in (tween/tween :fade-in screen [:fade :opacity] 1.0 0.0 1.0 :finish #(do