changeset 77:1ca7872b889b

Rename text-layer to label.
author Mikhail Kryshen <mikhail@kryshen.net>
date Tue, 31 Aug 2010 02:20:24 +0400
parents dafd4ff9d313
children 4c0f2af742ba
files README.ru src/net/kryshen/indyvon/demo.clj src/net/kryshen/indyvon/layers.clj
diffstat 3 files changed, 5 insertions(+), 5 deletions(-) [+]
line diff
     1.1 --- a/README.ru	Mon Aug 30 21:56:14 2010 +0400
     1.2 +++ b/README.ru	Tue Aug 31 02:20:24 2010 +0400
     1.3 @@ -47,7 +47,7 @@
     1.4  "сейчас нарисовать здесь кнопку") или описываться путем композиции
     1.5  слоев (предполагая, что реализованы функции border, vbox, text и
     1.6  button, которые создают слои):
     1.7 -  (border (hbox (text "Comment:") (button (text "Button"))))
     1.8 +  (border (hbox (label "Comment:") (button (label "Button"))))
     1.9  
    1.10  Отрисовку можно распараллелить с помощью функции async-layer, которая
    1.11  возвращает слой, показывающий результат отрисовки слоя-аргумента. При
     2.1 --- a/src/net/kryshen/indyvon/demo.clj	Mon Aug 30 21:56:14 2010 +0400
     2.2 +++ b/src/net/kryshen/indyvon/demo.clj	Tue Aug 31 02:20:24 2010 +0400
     2.3 @@ -61,7 +61,7 @@
     2.4  
     2.5  (def layer2m (miniature layer2 30 30))
     2.6  
     2.7 -(def layer3 (border (text-layer "Sample\ntext" :right :center)))
     2.8 +(def layer3 (border (label "Sample\ntext" :right :center)))
     2.9  
    2.10  (def layer
    2.11    (reify
     3.1 --- a/src/net/kryshen/indyvon/layers.clj	Mon Aug 30 21:56:14 2010 +0400
     3.2 +++ b/src/net/kryshen/indyvon/layers.clj	Tue Aug 31 02:20:24 2010 +0400
     3.3 @@ -147,10 +147,10 @@
     3.4                 (.getLeading tl)))
     3.5            0 layouts))
     3.6  
     3.7 -(defn text-layer
     3.8 +(defn label
     3.9    "Creates a layer to display multiline text."
    3.10    ([text]
    3.11 -     (text-layer text :left :top))
    3.12 +     (label text :left :top))
    3.13    ([text h-align v-align]
    3.14       (let [lines (re-split #"\r\n|\n|\r|\u0085|\u2028|\u2029" text)]
    3.15         (reify Layer
    3.16 @@ -302,7 +302,7 @@
    3.17                 fps (/ @frames elapsed)]
    3.18             (when (or (> elapsed update-interval) (not @display))
    3.19               (ref-set display
    3.20 -              (border (text-layer (format "%.1f" fps) :right :bottom) 0 5))
    3.21 +              (border (label (format "%.1f" fps) :right :bottom) 0 5))
    3.22               (ref-set frames 0)
    3.23               (ref-set prev-time time)))
    3.24           @display)))))