motion-prime/views/view_styler.rb in motion-prime-1.0.4 vs motion-prime/views/view_styler.rb in motion-prime-1.0.5

- old
+ new

@@ -133,15 +133,15 @@ true end end def set_image_options(key, value) - if key.end_with?('background_image') + if key.end_with?('background_image') && ui_image = value.uiimage if view.is_a?(UIControl) || view.is_a?(UISearchBar) - view.send :"set#{camelize_factory(key)}:forState", value.uiimage, UIControlStateNormal + view.send :"set#{camelize_factory(key)}:forState", ui_image, UIControlStateNormal else - view.setBackgroundColor value.uiimage.uicolor + view.setBackgroundColor ui_image.uicolor end true elsif key.end_with?('background_view') if view.is_a?(UITableView) bg_view = UIView.alloc.initWithFrame(view.bounds) @@ -150,11 +150,14 @@ else view.setValue value, forKey: low_camelize_factory(key) end true elsif key.end_with?('image') - view.setValue value.uiimage, forKey: camelize_factory(key) + if ui_image = value.uiimage + ui_image = ui_image.imageWithRenderingMode(2) if options[:tint_color] + view.setValue ui_image, forKey: camelize_factory(key) + end true end end def set_text_options(key, value) @@ -187,10 +190,10 @@ if key.end_with?('_content_inset') current_inset = view.contentInset current_inset.send("#{key.partition('_').first}=", value) view.contentInset = current_inset true - elsif key.end_with?('inset') || key.end_with?('indicator_insets') + elsif key.end_with?('inset') || key.end_with?('indicator_insets') || (key.end_with?('insets') && value.is_a?(Array)) inset = if value.to_s == 'none' UIEdgeInsetsMake(0, 320, 0, 0) elsif value.is_a?(Array) && value.count == 2 UIEdgeInsetsMake(0, value.first, 0, value.last) elsif value.is_a?(Array) && value.count == 4