コミット: 9d98778b26e76ea7b91168b6c82c8500e70aa66f - ruby-gtk3 (git)

Ruby GTK3移行後のメインリポジトリ

コミットメタ情報

• リビジョン: 9d98778b26e76ea7b91168b6c82c8500e70aa66f (tree)
• 日時: 2015-03-18 22:56:55
• 作者: Shyouzou Sugitani <shy@user...>
• コミッター: Shyouzou Sugitani

ログメッセージ

update pix.rb

変更サマリ

• modified: lib/ninix/balloon.rb
• modified: lib/ninix/kinoko.rb
• modified: lib/ninix/nekodorif.rb
• modified: lib/ninix/pix.rb
• modified: lib/ninix/surface.rb
• modified: test/test-pix.rb

差分

--- a/lib/ninix/balloon.rb
+++ b/lib/ninix/balloon.rb
@@ -1166,6 +1166,7 @@ module Balloon
       end
       redraw_arrow0(widget, cr)
       redraw_arrow1(widget, cr)
+      @window.set_shape(cr)
       return false
     end
 

--- a/lib/ninix/kinoko.rb
+++ b/lib/ninix/kinoko.rb
@@ -416,6 +416,7 @@ module Kinoko
       cr.set_operator(Cairo::OPERATOR_SOURCE)
       cr.paint()
       print("REDRAW: ", cr, "\n")
+      @window.set_shape(cr)
     end
 
     def get_image_surface(surface_id)

--- a/lib/ninix/nekodorif.rb
+++ b/lib/ninix/nekodorif.rb
@@ -379,6 +379,7 @@ module Nekodorif
       cr.set_source(@image_surface, 0, 0)
       cr.set_operator(Cairo::OPERATOR_SOURCE)
       cr.paint()
+      @window.set_shape(cr)
     end
 
     def delete()#widget, event)

--- a/lib/ninix/pix.rb
+++ b/lib/ninix/pix.rb
@@ -94,6 +94,21 @@ module Pix
       new_y = ((y - (surface_y - window_y)) * 100 / scale).to_i
       return new_x, new_y
     end
+
+    def set_shape(cr)
+      w, h = size
+      image_surface = cr.target.map_to_image
+      region = Cairo::Region.new()
+      data = image_surface.data
+      for i in 0..(data.size / 4 - 1)
+        if (data[i * 4 + 3].ord) != 0
+          x = i % image_surface.width
+          y = i / image_surface.width
+          region.union!(x, y, 1, 1)
+        end
+      end
+      input_shape_combine_region(region)
+    end
   end
 
 

--- a/lib/ninix/surface.rb
+++ b/lib/ninix/surface.rb
@@ -1321,12 +1321,12 @@ module Surface
     end
 
     def get_image_surface(surface_id, is_asis=false)
-      if not @surfaces.include?(surface_id.to_s)
+      if not @surfaces.include?(surface_id)
 #        logging.debug('cannot load surface #{0}'.format(surface_id))
         print('cannot load surface #' + surface_id.to_s, "\n")
         return Pix.create_blank_surface(100, 100)
       end
-      return create_surface_from_file(surface_id.to_s, is_asis=is_asis)
+      return create_surface_from_file(surface_id, is_asis=is_asis)
     end
 
     def draw_region(cr)
@@ -1456,6 +1456,7 @@ module Surface
       if @parent.handle_request('GET', 'get_preference', 'check_collision')
         draw_region(cr)
       end
+      @window.set_shape(cr)
     end
 
     def remove_overlay(actor)

--- a/test/test-pix.rb
+++ b/test/test-pix.rb
@@ -23,16 +23,7 @@ module NinixTest
       cr.set_source(@surface, 0, 0)
       cr.set_operator(Cairo::OPERATOR_SOURCE)
       cr.paint
-      region = Cairo::Region.new()
-      data = @surface.data
-      for i in 0..(data.size / 4 - 1)
-        if (data[i * 4 + 3].ord) != 0
-          x = i % @surface.width
-          y = i / @surface.width
-          region.union!(x, y, 1, 1)
-        end
-      end
-      @win.input_shape_combine_region(region)
+      @win.set_shape(cr)
     end
   end
 end