github-migration/compass
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

diagonal layout now goes i nthe correct direction and refactored some internals

Browse Source
This commit is contained in:
Scott Davis 2011-09-03 15:56:57 -04:00
parent c7c007672f
commit 09dd9456e1
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/compass/sass_extensions/sprites/layout_methods.rb
View File

@ -57,8 +57,8 @@ module Compass
def calculate_diagonal_dimensions def calculate_diagonal_dimensions
@width = @images.map {|image| image.width}.inject(0) {|width, sum| sum + width} @width = @images.inject(0) {|sum, img| sum + img.width}
@height = @images.map {|image| image.height}.inject(0) {|height, sum| sum + height} @height = @images.inject(0) {|sum, img| sum + img.height}
end end
def calculate_diagonal_positions def calculate_diagonal_positions
@ -66,11 +66,11 @@ module Compass
@images.each_with_index do |image, index| @images.each_with_index do |image, index|
if previous.nil? if previous.nil?
previous = image previous = image
image.top = 0 image.top = @height - image.height
image.left = 0 image.left = 0
next next
end end
image.top = previous.top + previous.height image.top = previous.top - image.height
image.left = previous.left + previous.width image.left = previous.left + previous.width
previous = image previous = image
end end

2
test/units/sprites/sprite_map_test.rb
View File

@ -126,7 +126,7 @@ class SpriteMapTest < Test::Unit::TestCase
base.generate base.generate
assert_equal 40, base.width assert_equal 40, base.width
assert_equal 40, base.height assert_equal 40, base.height
assert_equal [[0,0], [10,10], [20,20], [30,30]], base.images.map {|i| [i.top, i.left]} assert_equal [[30, 0], [20, 10], [10, 20], [0, 30]], base.images.map {|i| [i.top, i.left]}
assert File.exists?(base.filename) assert File.exists?(base.filename)
FileUtils.rm base.filename FileUtils.rm base.filename
end end