motion/joybox/ui/label.rb in joybox-1.0.0 vs motion/joybox/ui/label.rb in joybox-1.1.0

@@ -1,35 +1,63 @@
 module Joybox
   module UI
 
     class Label < CCLabelTTF
 
+      extend Joybox::Common::Initialize
+
       alias_method :text=, :setString
       alias_method :set_text, :setString
+      alias_method :text, :string
+      alias_method :alignment, :horizontalAlignment
+      alias_method :alignment=, :setHorizontalAlignment
+      alias_method :vertical_alignment, :verticalAlignment
+      alias_method :vertical_alignment=, :setVerticalAlignment
+      alias_method :font_name, :fontName
+      alias_method :font_name=, :setFontName
+      alias_method :font_size, :fontSize
+      alias_method :font_size=, :setFontSize
 
-      def self.defaults
+      TextAlignmentLeft = 0
+      TextAlignmentCenter = 1
+      TextAlignmentRight = 2
+
+      TextAlignmentTop = 0
+      TextAlignmentBottom = 2
+
+      LineBreakWordWrap = 0
+      LineBreakCharacterWrap = 1
+      LineBreakClip = 2
+      LineBreakHeadTruncation = 3
+      LineBreakTailTruncation = 4
+      LineBreakMiddleTruncation = 5
+
+      def defaults
         {
           text: '',
+          dimensions: CGSizeZero,
+          alignment: TextAlignmentCenter,
+          vertical_alignment: TextAlignmentTop,
           font_name: 'Marker Felt',
-          font_size: 12
+          font_size: 12,
+          line_break_mode: LineBreakWordWrap
         }
       end
 
-
-      def self.new(options = {})
-
+      def initialize(options = {})
         options = options.nil? ? defaults : defaults.merge!(options)
 
-        label = Label.labelWithString(options[:text], 
-                                      fontName: options[:font_name], 
-                                      fontSize: options[:font_size])
-
-        label.position = options[:position] if options.has_key? (:position)
-        label.color = options[:color] if options.has_key? (:color)
-
-        label
+        self.initWithString(options[:text], 
+                            fontName: options[:font_name], 
+                            fontSize: options[:font_size],
+                            dimensions: options[:dimensions],
+                            hAlignment: options[:alignment],
+                            vAlignment: options[:vertical_alignment],
+                            lineBreakMode: options[:line_break_mode])
+        
+        self.position = options[:position] if options.has_key? (:position)
+        self.color = options[:color] if options.has_key? (:color)
       end
-
     end
 
   end
-end
\ No newline at end of file
+end