@@ -196,19 +196,25 @@ module Prawn # # pdf.fill_color "f0ffc1" # - def fill_color(color) + def fill_color(color=nil) + return @fill_color unless color @fill_color = color set_fill_color - end + end + + alias_method :fill_color=, :fill_color # Sets the line stroking color. 6 digit HTML color codes are used. # # pdf.stroke_color "cc2fde" # - def stroke_color(color) + def stroke_color(color=nil) + return @stroke_color unless color @stroke_color = color set_stroke_color - end + end + + alias_method :stroke_color=, :stroke_color # Strokes and closes the current path. # @@ -265,9 +271,11 @@ module Prawn add_content "%.3f %.3f %.3f RG" % [r / 255.0, g / 255.0, b / 255.0] end - def update_colors - set_fill_color if @fill_color - set_stroke_color if @stroke_color + def update_colors + @fill_color ||= "000000" + @stroke_color ||= "000000" + set_fill_color + set_stroke_color end end lib/prawn/graphics.rb @@ -177,29 +177,28 @@ module Prawn # TODO: This is a bit of a hack and can be cleaned up if @background_color - old_fill_color, old_stroke_color = - @document.instance_eval { [@fill_color, @stroke_color] } - @document.fill_color @background_color - @document.stroke_color @background_color - - @document.canvas do - case border_style - when :all - point = [x,y-border] - h = height - border - when :no_top - point = [x,y-border/2.0] - h = height - border / 2.0 - else - point = [x,y-border/2.0] - h = height - end + + @document.mask(:fill_color, :stroke_color) do + @document.fill_color = @background_color + @document.stroke_color = @background_color + + @document.canvas do + case border_style + when :all + point = [x,y-border] + h = height - border + when :no_top + point = [x,y-border/2.0] + h = height - border / 2.0 + else + point = [x,y-border/2.0] + h = height + end - @document.fill_and_stroke_rectangle point, width, h - end + @document.fill_and_stroke_rectangle point, width, h + end + end - @document.fill_color old_fill_color || "000000" - @document.stroke_color old_stroke_color || "000000" end @cells.each do |e| lib/prawn/graphics/cell.rb c9b31cbf847268af540ad76e603922eaca347d10 Gregory Brown gregory.t.brown@gmail.com http://github.com/sandal/prawn/commit/3867937e578440e363e0f67f927adf006228450a 3867937e578440e363e0f67f927adf006228450a 2008-07-24T12:42:49-07:00 2008-07-24T12:42:49-07:00 More cleanup of earlier hacks and making things more normal when working outside of the generate block 6ffccd64b01d35afa96728b1cedfb5f8c420b39f Gregory Brown gregory.t.brown@gmail.com