From fda84faef9447f12b30c912b22878bea998129f2 Mon Sep 17 00:00:00 2001 From: Bryce Covert Date: Wed, 4 Nov 2015 16:15:38 -0800 Subject: [PATCH] progress on save load. --- desktop/src-common/advent/screens/title.clj | 26 ++++++++++----------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/desktop/src-common/advent/screens/title.clj b/desktop/src-common/advent/screens/title.clj index bfc20c99..16ff0643 100644 --- a/desktop/src-common/advent/screens/title.clj +++ b/desktop/src-common/advent/screens/title.clj @@ -1,5 +1,6 @@ (ns advent.screens.title - (:require [play-clj.core :refer :all] + (:require [clojure.string :as str] + [play-clj.core :refer :all] [play-clj.math :refer :all] [play-clj.ui :refer :all] [play-clj.utils :refer :all] @@ -207,41 +208,40 @@ (.setMaxCheckCount 1) (.setMinCheckCount 0) (.setUncheckLast true)) - make-cell (fn [image] [image :width 142 :pad 4 4 4 4 :height 104]) + [cell-w cell-h] [218 161] + make-cell (fn [image] [image :width cell-w :pad 4 4 4 4 :height cell-h]) make-save-screenshot (fn [[save-name save-screenshot]] (let [btn (doto (assoc (image-button (skin "ui/ui.json")) :save save-name) - (image-button! :set-size 142 104) + (image-button! :set-size cell-w cell-h) (image-button! :add (doto (Group. ) - (.setSize 126 88) - (.setOrigin (/ 126 2) (/ 88 2)) - + (.setSize (- cell-w 16) (- cell-h 16) ) + (.setOrigin (/ (- cell-w 16) 2) (/ (- cell-h 16) 2)) (.addActor (:object (doto (image (texture save-screenshot)) - (image! :set-size 126 88)))) - (.addActor (:object (make-label "content"))) - ) ) + (image! :set-size (- cell-w 16) (- cell-h 16))))) + (.addActor (:object (make-label (str " " (subs save-name 0 (min (.length save-name) 10)))))) + )) save-object)] (.add group (:object btn)) (ActorEntity. (:object btn)))) save-screenshots (map make-save-screenshot (:saves-list entities)) - grouped-screenshots (->> (partition-all 3 save-screenshots) + grouped-screenshots (->> (partition-all 2 save-screenshots) (mapcat (fn [group] (conj (map make-cell group) :row))))] [(doto (scroll-pane (table grouped-screenshots) (skin "ui/ui.json")) (scroll-pane! :set-fade-scroll-bars false)) - :colspan 3 :height 224 :width 476])) + :colspan 2 :height 224 :width 476])) (defn saves-menu [entities] (let [save-label (make-label "") continue-button (doto (make-button "Continue" :key :continue) (text-button! :set-disabled true))] - (assoc (make-table [[save-label :colspan 3 :height 32] + (assoc (make-table [[save-label :colspan 2 :height 32] :row (saves-table entities) :row - [(ActorEntity. (Widget.)) :width 150] [(make-button "Back" :key :back) :width 150] [continue-button :width 150]]) :save-label save-label