r2dsvg 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1b533b526c3036bd4871bd65fb8290c7940edadd27093997eeafd6dd1b9da764
-  data.tar.gz: 720f44a65ebdd583408e11bd2538c57023f4d862e81b9a87bc8fa063f7712e02
+  metadata.gz: ecd5ec0962a23e7eb820a5e46386c608707a5c1aa1bf5dfc85d259b94977ab60
+  data.tar.gz: cce9e032a47c4bc7ca2eb29e89b943e57ed908677ce0e203b7f5a3f93f0dbc0e
 SHA512:
-  metadata.gz: 2d0c784f1ef2a3fe4a9900e9f0d340b69f9b9d2d578a68e99d36b845f15b0ece63a4c5a8ac895c4c490466d76c68ffc77ef725ffcaa550740d83111053951eab
-  data.tar.gz: 53a22ec28deaa9fd2f0852697f9f5a395c73ac5cc4999d9bd0502969a7f62ace94f65133d5091d336da923617d2962f2b0d816bdcb0b402e1b221197fab41b19
+  metadata.gz: 51b383f6ff282e6e0dc6085ff6f1c486e195c10adbd769d96e284bcd6db31bbf600570c88ed7832f6f00ffc46876f97b7552a836c9ebe54682c62c36313239c0
+  data.tar.gz: ea9389beabc45a478f37870be2192e31310c085ec64086e54c8068267b1f32a5eaeebfea47ff4400fd8c583373ab56fc4db7307ded178d86ef009df3325f8bec

data/lib/r2dsvg.rb

@@ -268,21 +268,20 @@ class R2dSvg
     
     def draw_polygon(args)
 
-      points, style, e = args
+      vertices, style, e = args
 
-      puts ('points: ' + points.inspect).debug if @debug      
-      coords = points
+      puts ('vertices: ' + vertices.inspect).debug if @debug      
 
       if @debug then
         puts 'inside draw_polygon'.info
         puts ('style: ' + style.inspect).debug 
       end 
       
-      puts ('coords: ' + coords.inspect).debug if @debug      
+      puts ('vertices: ' + vertices.inspect).debug if @debug      
       
-      h = coords.map.with_index do |c2,i|
+      h = vertices.map.with_index do |coords,i|
 
-        %w(x y).zip(c2).map {|key, c| [(key + (i+1).to_s).to_sym, c] }
+        %w(x y).zip(coords).map {|key, c| [(key + (i+1).to_s).to_sym, c] }
         
       end.flatten(1).to_h
       puts ('triangle h: ' + h.inspect).debug if @debug      
@@ -424,6 +423,7 @@ class R2dSvg
   def initialize(svg, title: 'R2dSVG', debug: false)
 
     @svg, @debug = svg, debug
+    
     doc = Svgle.new(svg, callback: self, debug: debug)
     instructions = Render.new(doc, debug: debug).to_a
 
@@ -439,34 +439,74 @@ class R2dSvg
     
     drawing.render instructions
 
-    @doc = doc              
+    @doc = doc                  
     
-    window.on(:mouse_move) {|event|  mouse(:move, event) }    
+    window.on(:mouse_move) do |event|
+      mouse :mousemove, event
+      mouse :mouseenter, event
+    end
     
     window.on(:mouse_down) do |event|
-      mouse :down, event if event.button == :left
-    end
-
+      
+      if event.button == :left then
+        
+        # click and mousedown do the same thing
+        mouse :click, event 
+        mouse :mousedown, event
+      end
+      
+    end          
 
     window.show
   end
   
+  
   private
   
   def mouse(action, event)
     
     doc = @doc
     
-    @doc.root.xpath("//*[@onmouse#{action}]").each do |x|
+    @doc.root.xpath("//*[@on#{action}]").each do |x|
 
       #puts 'x.class: ' + x.inspect if @debug
       if x.obj and x.obj.contains? event.x, event.y then
-        eval x.method(('onmouse' + action.to_s).to_sym).call()
+        
+          
+        if not x.active? then
+          x.active = true
+        elsif action == :mouseenter
+          next
+        end
+                  
+        if block_given? then
+          valid = yield(x)
+          eval x.method(('on' + action.to_s).to_sym).call() if valid
+        else
+          eval x.method(('on' + action.to_s).to_sym).call()
+        end
+        
+      else
+        
+        if x.active? then
+          x.active = false
+          onleave
+        end
       end
     
     end
         
   end
+  
+  def onleave()
+
+    @doc.root.xpath("//*[@onmouseleave]").each do |x|
+      puts 'onleave'.info if @debug
+      eval x.method(:onmouseleave).call()
+    end
+
+  end
+    
 end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: r2dsvg
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - James Robertson