Revision
613
Author
lsansonetti@apple.com
Date
2008-09-19 23:04:43 -0700 (Fri, 19 Sep 2008)

Log Message

consider padding flags when calculating the other dimension expandable size

Modified Paths

Diff

Modified: MacRuby/trunk/lib/hotcocoa/layout_view.rb (612 => 613)


--- MacRuby/trunk/lib/hotcocoa/layout_view.rb	2008-09-20 03:16:38 UTC (rev 612)
+++ MacRuby/trunk/lib/hotcocoa/layout_view.rb	2008-09-20 06:04:43 UTC (rev 613)
@@ -390,9 +390,9 @@
       
       if (vertical ? options.expand_width? : options.expand_height?)
         if vertical
-          view_frame.size.width = view_size.width - (2 * @margin)
+          view_frame.size.width = view_size.width - (2 * @margin) - options.right_padding - options.left_padding
         else
-          view_frame.size.height = view_size.height - (2 * @margin)
+          view_frame.size.height = view_size.height - (2 * @margin) - options.top_padding - options.bottom_padding
         end
       else
         case options.align