remove underscore from 2-arg versions of maximum

This commit is contained in:
Michael K. Borregaard 2017-05-25 12:51:46 +02:00
parent bd1d562c57
commit 9e32d3743d

View File

@ -301,10 +301,10 @@ bottompad(layout::GridLayout) = layout.minpad[4]
function _update_min_padding!(layout::GridLayout) function _update_min_padding!(layout::GridLayout)
map(_update_min_padding!, layout.grid) map(_update_min_padding!, layout.grid)
layout.minpad = ( layout.minpad = (
_maximum(map(leftpad, layout.grid[:,1])), maximum(map(leftpad, layout.grid[:,1])),
_maximum(map(toppad, layout.grid[1,:])), maximum(map(toppad, layout.grid[1,:])),
_maximum(map(rightpad, layout.grid[:,end])), maximum(map(rightpad, layout.grid[:,end])),
_maximum(map(bottompad, layout.grid[end,:])) maximum(map(bottompad, layout.grid[end,:]))
) )
end end
@ -349,10 +349,10 @@ function update_child_bboxes!(layout::GridLayout, minimum_perimeter = [0mm,0mm,0
# get the max horizontal (left and right) padding over columns, # get the max horizontal (left and right) padding over columns,
# and max vertical (bottom and top) padding over rows # and max vertical (bottom and top) padding over rows
# TODO: add extra padding here # TODO: add extra padding here
pad_left = _maximum(minpad_left, 1) pad_left = maximum(minpad_left, 1)
pad_top = _maximum(minpad_top, 2) pad_top = maximum(minpad_top, 2)
pad_right = _maximum(minpad_right, 1) pad_right = maximum(minpad_right, 1)
pad_bottom = _maximum(minpad_bottom, 2) pad_bottom = maximum(minpad_bottom, 2)
# make sure the perimeter match the parent # make sure the perimeter match the parent
pad_left[1] = max(pad_left[1], minimum_perimeter[1]) pad_left[1] = max(pad_left[1], minimum_perimeter[1])