From 0154b13e686559d5e623bffe1d22b6b038b8f98a Mon Sep 17 00:00:00 2001 From: Andy Meneely Date: Tue, 19 May 2015 16:49:13 -0400 Subject: [PATCH] Use cairo context wrapper for fill colors on marketing Actually deliver what I promised Fixes #71 --- lib/squib/graphics/hand.rb | 6 ++++-- lib/squib/graphics/showcase.rb | 7 +++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/lib/squib/graphics/hand.rb b/lib/squib/graphics/hand.rb index 8ec57a3..7b3afdc 100644 --- a/lib/squib/graphics/hand.rb +++ b/lib/squib/graphics/hand.rb @@ -1,3 +1,5 @@ +require 'squib/graphics/cairo_context_wrapper' + module Squib class Deck @@ -29,8 +31,8 @@ module Squib end end x, y, w, h = cxt.target.ink_extents # I love Ruby assignment ;) - png_cxt = Cairo::Context.new(Cairo::ImageSurface.new(w + 2*margin, h + 2*margin)) - png_cxt.set_source_color(fill_color) + png_cxt = Squib::Graphics::CairoContextWrapper.new(Cairo::Context.new(Cairo::ImageSurface.new(w + 2*margin, h + 2*margin))) + png_cxt.set_source_squibcolor(fill_color) png_cxt.paint png_cxt.translate(-x + margin, -y + margin) png_cxt.set_source(cxt.target) diff --git a/lib/squib/graphics/showcase.rb b/lib/squib/graphics/showcase.rb index 5da79de..491d22e 100644 --- a/lib/squib/graphics/showcase.rb +++ b/lib/squib/graphics/showcase.rb @@ -1,3 +1,5 @@ +require 'squib/graphics/cairo_context_wrapper' + module Squib class Deck @@ -16,8 +18,9 @@ module Squib out_width = range.size * ((@width - 2*trim) * scale * offset) + 2*margin out_height = reflect_offset + (1.0 + reflect_percent) * (@height - 2*trim) + 2*margin out_cc = Cairo::Context.new(Cairo::ImageSurface.new(out_width, out_height)) - out_cc.set_source_color(fill_color) - out_cc.paint + wrapper = Squib::Graphics::CairoContextWrapper.new(out_cc) + wrapper.set_source_squibcolor(fill_color) + wrapper.paint cards = range.collect { |i| @cards[i] } cards.each_with_index do |card, i|