motion-prime/elements/label.rb in motion-prime-0.2.1 vs motion-prime/elements/label.rb in motion-prime-0.3.0

@@ -1,13 +1,24 @@
 module MotionPrime
   class LabelElement < BaseElement
-    include MotionPrime::ElementTextHeightMixin
+    include MotionPrime::ElementTextDimensionsMixin
 
+    before_render :size_to_fit_if_needed
     after_render :size_to_fit
 
     def size_to_fit
       if computed_options[:size_to_fit] || style_options[:size_to_fit]
-        view.sizeToFit
+        if computed_options[:width]
+          view.setHeight content_height + 2 # TODO maybe set width too as it can be wider
+        else
+          view.sizeToFit
+        end
+      end
+    end
+
+    def size_to_fit_if_needed
+      if computed_options[:size_to_fit] && computed_options[:width]
+        @computed_options[:height_to_fit] = content_height
       end
     end
 
     def computed_inner_top
       computed_options[:top].to_i
\ No newline at end of file