Adding Offset argument support to sass mixing function

merbjedi · merbjedi · commit 63daa9114048 · 2009-11-19T08:27:07.000-08:00
diff --git a/lib/sprite/builder.rb b/lib/sprite/builder.rb
@@ -70,11 +70,13 @@ def write_image(image)
         if image['align'].to_s == 'horizontal'
           x = dest_image.columns + spaced_by
           y = 0
+          align = "horizontal"
         else
           x = 0
           y = dest_image.rows + spaced_by
+          align = "vertical"
         end
-        results << combiner.image_properties(source_image).merge(:x => -x, :y => -y, :group => name)
+        results << combiner.image_properties(source_image).merge(:x => -x, :y => -y, :group => name, :align => align)
         dest_image = combiner.composite_images(dest_image, source_image, x, y)
       end
       
diff --git a/lib/sprite/styles/sass_mixin_generator.rb b/lib/sprite/styles/sass_mixin_generator.rb
@@ -11,7 +11,7 @@ def write(path, sprite_files)
         File.open(File.join(Sprite.root, path), 'w') do |f|
           add_else = false
 
-          f.puts "= sprite(!group_name, !image_name)"
+          f.puts "= sprite(!group_name, !image_name, !offset=0)"
           sprite_files.each do |sprite_file, sprites|
             sprites.each do |sprite|
               
@@ -20,9 +20,16 @@ def write(path, sprite_files)
                 f << "else "
               end
               add_else = true
+              #{sprite[:x]}px #{sprite[:y]}px
+              
+              if sprite[:align] == 'horizontal'
+                background_offset = "\#{#{sprite[:x]}+!offset}px #{sprite[:y]}px"
+              else
+                background_offset = "#{sprite[:x]}px \#{#{sprite[:y]}+!offset}px"
+              end
               
               f.puts %{if !group_name == "#{sprite[:group]}" and !image_name == "#{sprite[:name]}"}
-              f.puts "    background: url('http://github.com/#{@builder.config['image_output_path']}#{sprite_file}') no-repeat #{sprite[:x]}px #{sprite[:y]}px"
+              f.puts "    background: url('http://github.com/#{@builder.config['image_output_path']}#{sprite_file}') no-repeat #{background_offset}"
               f.puts "    width: #{sprite[:width]}px"
               f.puts "    height: #{sprite[:height]}px"
             end
