From 3326629189ac963c5c1429abb6956e93f724126b Mon Sep 17 00:00:00 2001 From: Bryce Covert Date: Wed, 4 Nov 2015 16:19:06 -0800 Subject: [PATCH] minor tweak. --- desktop/src-common/advent/screens/title.clj | 95 +++++++++------------ 1 file changed, 39 insertions(+), 56 deletions(-) diff --git a/desktop/src-common/advent/screens/title.clj b/desktop/src-common/advent/screens/title.clj index 16ff0643..903d102c 100644 --- a/desktop/src-common/advent/screens/title.clj +++ b/desktop/src-common/advent/screens/title.clj @@ -335,11 +335,7 @@ (render! screen (sort-by :z (filter :object (vals entities))) ) entities)) - :show-screen (fn [entities] - entities) - - - + :show-screen (fn [entities] entities) :on-key-up (fn [screen entities] @@ -349,68 +345,55 @@ :on-ui-changed (fn [{:keys [actor] :as screen} [entities]] - (let [e (-> actor .getUserObject) - actor-key (:key e)] + (when-not (get-in entities [:tweens :fade-out]) - (cond + (let [e (-> actor .getUserObject) + actor-key (:key e)] + + (cond - (= :music-volume-slider actor-key) - (do (swap! utils/settings assoc :music-volume (slider! e :get-value)) - (utils/save-settings!) - entities) + (= :music-volume-slider actor-key) + (do (swap! utils/settings assoc :music-volume (slider! e :get-value)) + (utils/save-settings!) + entities) - (= :sound-volume-slider actor-key) - (do (swap! utils/settings assoc :sound-volume (slider! e :get-value)) - (utils/save-settings!) - entities) + (= :sound-volume-slider actor-key) + (do (swap! utils/settings assoc :sound-volume (slider! e :get-value)) + (utils/save-settings!) + entities) - (#{:back } actor-key) - (-> entities - (dissoc :save-menu) - (assoc :main-menu (main-menu))) + (#{:back } actor-key) + (-> entities + (dissoc :save-menu) + (assoc :main-menu (main-menu))) - (= :chapters actor-key) - (-> entities - (dissoc :main-menu) - (assoc :save-menu (saves-menu entities))) + (= :chapters actor-key) + (-> entities + (dissoc :main-menu) + (assoc :save-menu (saves-menu entities))) - (= :toggle-fullscreen actor-key) - (utils/toggle-fullscreen!) + (= :toggle-fullscreen actor-key) + (utils/toggle-fullscreen!) - (= :end-quest actor-key) - (quit screen entities) + (= :end-quest actor-key) + (quit screen entities) - (= :continue-or-start actor-key) - (start-playing screen entities (if (= "Begin quest" (quest-label)) - nil - :autosave)) + (= :continue-or-start actor-key) + (start-playing screen entities (if (= "Begin quest" (quest-label)) + nil + :autosave)) - (= :continue actor-key) - (start-playing screen entities (saves/name->save (:selected-save entities))) + (= :continue actor-key) + (start-playing screen entities (saves/name->save (:selected-save entities))) - (:save e) - (do - (label! (-> entities :save-menu :save-label) :set-text (:save e)) - (text-button! (-> entities :save-menu :continue-button) :set-disabled false) - (assoc entities :selected-save (:save e))) + (:save e) + (do + (label! (-> entities :save-menu :save-label) :set-text (:save e)) + (text-button! (-> entities :save-menu :continue-button) :set-disabled false) + (assoc entities :selected-save (:save e))) - :else - entities))) - - :on-touch-up (fn [screen [{:keys [prev next saves-list save-index] :as entities}]] - (when-not (get-in entities [:tweens :fade-out]) - (let [[x y] (utils/unproject screen) - selected-save (get-selected-save entities [x y])] - (cond - - - - selected-save - (start-playing screen entities (:save selected-save)) - - :else - nil)))) - + :else + entities)))) :on-resize (fn [{:keys [viewport width height]} [entities]] (.update viewport width height false)