Mercurial > hg > indyvon
changeset 136:1a5fd362114d
Updated dependency: Guava 13.0.1.
author | Mikhail Kryshen <mikhail@kryshen.net> |
---|---|
date | Tue, 18 Sep 2012 14:43:26 +0400 |
parents | 7eddb035d9c4 |
children | 748f4eba4f58 |
files | project.clj src/net/kryshen/indyvon/layers.clj |
diffstat | 2 files changed, 7 insertions(+), 8 deletions(-) [+] |
line diff
1.1 --- a/project.clj Thu Apr 26 19:23:04 2012 +0400 1.2 +++ b/project.clj Tue Sep 18 14:43:26 2012 +0400 1.3 @@ -3,7 +3,7 @@ 1.4 :url "https://bitbucket.org/kryshen/indyvon" 1.5 :warn-on-reflection true 1.6 :dependencies [[org.clojure/clojure "1.3.0"] 1.7 - [com.google.guava/guava "11.0.1"]] 1.8 + [com.google.guava/guava "13.0.1"]] 1.9 ;;:aot [net.kryshen.indyvon.core 1.10 ;; net.kryshen.indyvon.async 1.11 ;; net.kryshen.indyvon.layers
2.1 --- a/src/net/kryshen/indyvon/layers.clj Thu Apr 26 19:23:04 2012 +0400 2.2 +++ b/src/net/kryshen/indyvon/layers.clj Tue Sep 18 14:43:26 2012 +0400 2.3 @@ -183,16 +183,15 @@ 2.4 (-> (CacheBuilder/newBuilder) 2.5 (.softValues) 2.6 (.expireAfterAccess (long 1) TimeUnit/SECONDS) 2.7 - (.build 2.8 - (proxy [CacheLoader] [] 2.9 - (load [[^String s ^Font f ^FontRenderContext frc]] 2.10 - (TextLayout. s f frc)))))) 2.11 + (.build))) 2.12 2.13 -(defn- get-text-layout [line font font-context] 2.14 - (.get text-layout-cache [line font font-context])) 2.15 +(defn- get-text-layout 2.16 + [^String line ^Font font ^FontRenderContext font-context] 2.17 + (.get text-layout-cache [line font font-context] 2.18 + #(TextLayout. line font font-context))) 2.19 2.20 (defn- layout-text 2.21 - [lines ^Font font ^FontRenderContext font-context] 2.22 + [lines font font-context] 2.23 (map #(get-text-layout % font font-context) lines)) 2.24 2.25 (defn- text-width [layouts]