Tweaked formatting in the color_helper lib and fixed a bug in the color_helper#hex_color_brighten() function

This commit is contained in:
Nate Kane 2010-12-07 22:36:35 +10:00
parent 9752b569d9
commit 6bd76247a4

View File

@ -1,3 +1,6 @@
" Author: Nate Kane <nathanaelkane AT gmail DOT com>
" Homepage: http://github.com/nathanaelkane/vim-indent-guides
" "
" Regex pattern for a hex color. " Regex pattern for a hex color.
" "
@ -43,12 +46,14 @@ endfunction
" "
function! color_helper#hex_color_to_rgb(hex_color) function! color_helper#hex_color_to_rgb(hex_color)
let l:rgb = [] let l:rgb = []
if matchstr(a:hex_color, s:hex_color_pattern) == a:hex_color if matchstr(a:hex_color, s:hex_color_pattern) == a:hex_color
let l:red = color_helper#hex_to_dec(strpart(a:hex_color, 1, 2)) let l:red = color_helper#hex_to_dec(strpart(a:hex_color, 1, 2))
let l:green = color_helper#hex_to_dec(strpart(a:hex_color, 3, 2)) let l:green = color_helper#hex_to_dec(strpart(a:hex_color, 3, 2))
let l:blue = color_helper#hex_to_dec(strpart(a:hex_color, 5, 2)) let l:blue = color_helper#hex_to_dec(strpart(a:hex_color, 5, 2))
let l:rgb = [l:red, l:green, l:blue] let l:rgb = [l:red, l:green, l:blue]
end end
return l:rgb return l:rgb
endfunction endfunction
@ -61,6 +66,7 @@ function! color_helper#rgb_color_to_hex(rgb_color)
let l:hex_color .= color_helper#dec_to_hex(a:rgb_color[0], 2) " red let l:hex_color .= color_helper#dec_to_hex(a:rgb_color[0], 2) " red
let l:hex_color .= color_helper#dec_to_hex(a:rgb_color[1], 2) " green let l:hex_color .= color_helper#dec_to_hex(a:rgb_color[1], 2) " green
let l:hex_color .= color_helper#dec_to_hex(a:rgb_color[2], 2) " blue let l:hex_color .= color_helper#dec_to_hex(a:rgb_color[2], 2) " blue
return l:hex_color return l:hex_color
endfunction endfunction
@ -71,9 +77,11 @@ endfunction
function! color_helper#hex_color_brighten(color, percent) function! color_helper#hex_color_brighten(color, percent)
let l:rgb = color_helper#hex_color_to_rgb(a:color) let l:rgb = color_helper#hex_color_to_rgb(a:color)
let l:rgb_brightened = [] let l:rgb_brightened = []
for decimal in l:rgb for decimal in l:rgb
call add(l:rgb_brightened, float2nr((255 - decimal) * a:percent)) call add(l:rgb_brightened, float2nr(decimal * (a:percent + 1)))
endfor endfor
return color_helper#rgb_color_to_hex(l:rgb_brightened) return color_helper#rgb_color_to_hex(l:rgb_brightened)
endfunction endfunction
@ -84,9 +92,11 @@ endfunction
function! color_helper#hex_color_darken(color, percent) function! color_helper#hex_color_darken(color, percent)
let l:rgb = color_helper#hex_color_to_rgb(a:color) let l:rgb = color_helper#hex_color_to_rgb(a:color)
let l:rgb_darkened = [] let l:rgb_darkened = []
for decimal in l:rgb for decimal in l:rgb
call add(l:rgb_darkened, float2nr(decimal * (1 - a:percent))) call add(l:rgb_darkened, float2nr(decimal * (1 - a:percent)))
endfor endfor
return color_helper#rgb_color_to_hex(l:rgb_darkened) return color_helper#rgb_color_to_hex(l:rgb_darkened)
endfunction endfunction