gtk2svg 0.2.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c328f57948ea7c88a00d4435e4ea49fea7bd0359
-  data.tar.gz: b2e125a43197eb912201b301e824648c921bb328
+  metadata.gz: f33931e9f61d6c9e991b3ee225314749df9da2f3
+  data.tar.gz: 5286219c0ef5102a35d1924081f76ce14dbc9119
 SHA512:
-  metadata.gz: 0f8d8769120799c24f0d8f44ef9ce19f21a6974929f4e4962c1ba307108932630bb6b35968d77dd0a4bf63faf733639488e0fbce225849b1c4656fb8374299f0
-  data.tar.gz: eaa49e1baa8623bb57e13deef433a4e11aba0db50935f286abf65c99ef4a7301f22d77df872f33feecfb5483af81b05002c8d72b21e68c201d798cfcbbfeaa30
+  metadata.gz: 577683577cedfc3c4a092aa0cbaaddcc21c1899001c1dd414832ecc1b428c57fce4bf077b75fa327608efcb23aa49493b9113ac66d0994e7cec535db61696c5c
+  data.tar.gz: 01688463c05b3af1bc7b7b04c32346a1ba5d478b1e9930ef61c9e25fc700c2c77fc4698d6bde7e9f1ca953df444e4efc5adebb2b4f3bd28dea8931f942015aa7

data/lib/gtk2svg.rb

@@ -4,6 +4,7 @@
 
 require 'gtk2'
 require 'dom_render'
+require 'svgle'
 
 
 # Description: Experimental gem to render SVG within an GTK2 application. 
@@ -60,7 +61,7 @@ module Gtk2SVG
       style = e2.style
       style[:stroke_width] = style.delete(:'stroke-width') || '3'
 
-      x1, y1, x2, y2 = %i(x y x2 y2).map{|x| h[x].to_i }
+      x1, y1, x2, y2 = %i(x1 y1 x2 y2).map{|x| h[x].to_i }
 
       [:draw_line, [x1, y1, x2, y2], style, render_all(e)]
     end    
@@ -209,20 +210,32 @@ module Gtk2SVG
   
   class Main
     
-    attr_accessor :svg
+    attr_accessor :doc, :svg
+    attr_reader :width, :height
     
     def initialize(svg)
       
       @svg = svg
+      @doc = Svgle.new(svg)
       @area = area = Gtk::DrawingArea.new
       
+      window = Gtk::Window.new
+      width, height = %i(width height).map{|x| @doc.root.attributes[x] }
+      
+      if width and height then
+        @width, @height = width.to_i, height.to_i
+        window.set_default_size(@width, @height)
+      end
+      
       area.signal_connect("expose_event") do      
-        a = Render.new(@svg).to_a
+        a = Render.new(@doc).to_a
         drawing = DrawingInstructions.new area
         drawing.render a
       end
       
-      Gtk::Window.new.add(area).show_all
+      window.add(area).show_all
+      window.show_all.signal_connect("destroy"){Gtk.main_quit}
+
       Thread.new {Gtk.main  }
     end
     
@@ -230,6 +243,11 @@ module Gtk2SVG
       @area.queue_draw
     end
     
+    def svg=(svg)
+      @svg = svg
+      @doc = Svgle.new(svg)
+    end
+    
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gtk2svg
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.1
 platform: ruby
 authors:
 - James Robertson
@@ -73,6 +73,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.2.0
+- !ruby/object:Gem::Dependency
+  name: svgle
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.0
 description: 
 email: james@r0bertson.co.uk
 executables: []