gtk2svg 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e149ab0b8712be12ea26185c47fcf982bde3db03
-  data.tar.gz: cd4460998d0538f7107fec308bd50a8d7f13a4db
+  metadata.gz: 28a3f4511a21ce303b6e31768b3dc67885dcf014
+  data.tar.gz: a8d8a02c3e6b894e764a6d6b239b61e7e08bc2cb
 SHA512:
-  metadata.gz: 1d691b4d2575ed93b62a5a090d47f544548b72df21082d90590cbc1f4d3e3b95694d2f021dd50a8782d202b80f12df85c5a637d8d0ac396c8d94677c59c6870c
-  data.tar.gz: 4c03099c6e60ca9c67134961687a8e455596c100a6b8ae11580591c5348b7de88cdf1d36c9e31f9a9453430e889947096f6df14c3216a0a10347715ea384174c
+  metadata.gz: f6ca9424567119773389548e48f14a975742473260e2dcb62a97d9fba6f241edfcba57341008acfe29db46fecd1da0b2c689df8ea61714124211ee048bb49965
+  data.tar.gz: 42ac8dcda9c90462ff0048c377887eec0168d19d3b1f66cd366ff4741fd4ca28f9e3595dfcd065a8e5994345debc081f93e68688616e5bd6536bd65228be1b2b

data/lib/gtk2svg.rb

@@ -9,27 +9,6 @@ require 'dom_render'
 # Description: Experimental gem to render SVG within an GTK2 application. 
 #           Currently it can only render rectangles along with the fill colour.
 
-module SVG
-  class Element
-
-    attr_reader :style
-
-    def initialize(attributes, style)
-
-      @h = {x: '0', y: '0'}.merge attributes 
-
-      @style = {fill: 'black'}
-      @style.merge!(style) if attributes[:style]
-
-    end
-
-    def attributes()
-      @h
-    end
-
-  end
-end
-
 module Gtk2SVG
 
   class Render < DomRender
@@ -64,6 +43,19 @@ module Gtk2SVG
 
       [:draw_rectangle, [x1, y1, x2, y2], style, render_all(e)]
     end
+    
+    def text(e, attributes, style)
+
+      e2 = SVG::Element.new attributes, style
+      h = e2.attributes
+      style = e2.style.merge({font_size: '20'})
+
+
+      x, y, fill = %i(x y fill).map{|x| h[x] }
+      style.merge!({fill: fill})
+
+      [:draw_layout, [x.to_i, y.to_i], e.text, style, render_all(e)]
+    end    
 
   end
 
@@ -95,6 +87,22 @@ module Gtk2SVG
       gc = gc_ini(fill: style[:fill] || :none)
       @area.window.draw_rectangle(gc, 1, x1, y1, x2, y2)
     end
+    
+    def draw_layout(args)
+
+      coords, text, style = args
+
+      x, y = coords
+      
+      
+      layout = Pango::Layout.new(Gdk::Pango.context)
+      layout.font_description = Pango::FontDescription.\
+                                             new('Sans ' + style[:font_size])      
+      layout.text = text
+            
+      gc = gc_ini(fill: style[:fill] || :none)
+      @area.window.draw_layout(gc, x, y, layout)
+    end    
 
     def window(args)
     end
@@ -112,8 +120,11 @@ module Gtk2SVG
         x, *remaining = rawx
 
         if x.is_a? Symbol then
-          method(x).call(args=remaining.take(2))
+          puts 'sym'
+          puts 'remaining: ' + remaining.inspect
+          method(x).call(args=remaining[0..-2])
         elsif x.is_a? String then
+          puts 'ff'
           draw remaining
         elsif x.is_a? Array
           draw remaining
@@ -155,26 +166,6 @@ module Gtk2SVG
 end
 
 
-if __FILE__ == $0 then
-
-  # Read an SVG file
-  s = File.read(ARGV[0])
-
-  area = Gtk::DrawingArea.new
-
-  area.signal_connect("expose_event") do
-
-    drawing = Gtk2SVG::DrawingInstructions.new area
-    drawing.render Gtk2SVG::Render.new(s).to_a
-
-  end
-
-  Gtk::Window.new.add(area).show_all
-  Gtk.main
-
-end
-
-
 
 if __FILE__ == $0 then
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gtk2svg
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - James Robertson