From 16b59813de078a2e292cd10588290c4025999c12 Mon Sep 17 00:00:00 2001 From: Bryce Covert Date: Tue, 10 Nov 2015 08:42:00 -0800 Subject: [PATCH] just adding a button instead. --- desktop/src-common/advent/screens/title.clj | 27 ++++++++++++--------- 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/desktop/src-common/advent/screens/title.clj b/desktop/src-common/advent/screens/title.clj index dd8146f0..ea28c743 100644 --- a/desktop/src-common/advent/screens/title.clj +++ b/desktop/src-common/advent/screens/title.clj @@ -260,19 +260,23 @@ (scroll-pane! :set-fade-scroll-bars false))] (.setScrollFocus stage (:object scroll-pane)) [scroll-pane - :colspan 2 :height 224 :width 476])) + :colspan 3 :height 224 :width 476])) (defn saves-menu [entities stage] (let [save-label (make-label "") continue-button (doto (make-button "Continue" :key :continue) - (text-button! :set-disabled true))] - (assoc (make-table [[save-label :colspan 2 :height 32] + (text-button! :set-disabled true)) + delete-button (doto (make-button "Delete" :key :delete) + (text-button! :set-disabled true))] + (assoc (make-table [[save-label :colspan 3 :height 32] :row (saves-table entities stage) :row - [(make-button "Back" :key :back) :width 150] - [continue-button :width 150]]) + [delete-button :width 100] + [(make-button "Back" :key :back) :width 100] + [continue-button :width 100]]) :save-label save-label + :delete-button delete-button :continue-button continue-button))) @@ -419,9 +423,9 @@ (= :continue actor-key) (start-playing screen entities (:selected-save entities)) - (:save-to-remove e) + (= :delete actor-key) (do - (utils/remove-save (:save-to-remove e)) + (utils/remove-save (:id (:selected-save entities))) (as-> entities entities (dissoc entities :save-menu) (assoc entities :saves-list (doto (utils/snapshot-screenshots) @@ -434,14 +438,13 @@ (do (label! (-> entities :save-menu :save-label) :set-text (:name (:save e))) (text-button! (-> entities :save-menu :continue-button) :set-disabled false) - (.addActor (:object e) (:object (doto (make-button "X" :save-to-remove (:id (:save e))) - (text-button! :set-x 180) - (text-button! :set-y 120)))) + (text-button! (-> entities :save-menu :delete-button) :set-disabled false) + (assoc entities :selected-save (:save e))) (do (label! (-> entities :save-menu :save-label) :set-text "") - (.removeActor (:object e) (last (.getChildren (:object e)))) - (text-button! (-> entities :save-menu :continue-button) :set-disabled true)))) + (text-button! (-> entities :save-menu :continue-button) :set-disabled true) + (text-button! (-> entities :save-menu :delete-button) :set-disabled true)))) (:chapter e) (start-playing screen entities (:chapter e))