提交: a3534f9cf7e4562a043ee0fbabefe89b65d18b7c - ruby-gtk3 (git)

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

Commit MetaInfo

• 修訂: a3534f9cf7e4562a043ee0fbabefe89b65d18b7c (tree)
• 時間: 2017-08-12 21:39:53
• 作者: Shyouzou Sugitani <shy@user...>
• Commiter: Shyouzou Sugitani

Log Message

update for Ruby-GNOME2 >= 3.1.2

Change Summary

• modified: ChangeLog
• modified: lib/ninix/balloon.rb
• modified: lib/ninix/pix.rb

差異

--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+Sat August 12 2017   Shyouzou Sugitani <[e-mail]>
+	* Ruby-GNOME2 3.1.2対応.
+
 Mon June 26 2017   Shyouzou Sugitani <[e-mail]>
 	* gemspecを追加.
 

--- a/lib/ninix/balloon.rb
+++ b/lib/ninix/balloon.rb
@@ -1027,7 +1027,7 @@ module Balloon
           markup = set_markup(i, @text_buffer[i])
         end
         update_line_regions(line + 1, new_y)
-        @layout.set_markup(markup, -1)
+        @layout.set_markup(markup)
         cr.set_source_rgb(@text_normal_color)
         cr.move_to(x, y)
         cr.show_pango_layout(@layout)
@@ -1071,43 +1071,43 @@ module Balloon
           x, y, w, h = @line_regions[n - @lineno]
           if sl == el
             markup = set_markup(n, @text_buffer[n][0, sn])
-            @layout.set_markup(markup, -1)
+            @layout.set_markup(markup)
             text_w, text_h =  @layout.pixel_size
             x += text_w
             markup = set_markup(n, @text_buffer[n][sn, en])
-            @layout.set_markup(markup, -1)
+            @layout.set_markup(markup)
             text_w, text_h = @layout.pixel_size
             w = text_w
             start = sn
             end_ = en
           elsif n == sl
             markup = set_markup(n, @text_buffer[n][0, sn])
-            @layout.set_markup(markup, -1)
+            @layout.set_markup(markup)
             text_w, text_h = @layout.pixel_size
             x += text_w
             markup = set_markup(n, @text_buffer[n][sn, @text_buffer.length])
-            @layout.set_markup(markup, -1)
+            @layout.set_markup(markup)
             text_w, text_h = @layout.pixel_size
             w = text_w
             start = sn
             end_ = @text_buffer[n].length
           elsif n == el
             markup = set_markup(n, @text_buffer[n][0, en])
-            @layout.set_markup(markup, -1)
+            @layout.set_markup(markup)
             text_w, text_h = @layout.pixel_size
             w = text_w
             start = 0
             end_ = en
           else
             markup = set_markup(n, @text_buffer[n])
-            @layout.set_markup(markup, -1)
+            @layout.set_markup(markup)
             text_w, text_h = @layout.pixel_size
             w = text_w
             start = 0
             end_ = @text_buffer[n].length
           end
           markup = set_markup(n, @text_buffer[n][start, end_])
-          @layout.set_markup(markup, -1)
+          @layout.set_markup(markup)
           cr.set_source_rgb(@cursor_color)
           cr.rectangle(x, y, w, h)
           cr.fill()
@@ -1134,7 +1134,7 @@ module Balloon
             x, y, w, h = @line_regions[n - @lineno]
             if n == sl
               markup = set_markup(n, @text_buffer[n][0, sn])
-              @layout.set_markup(markup, -1)
+              @layout.set_markup(markup)
               text_w, text_h = @layout.pixel_size
               x += text_w
             end
@@ -1145,7 +1145,7 @@ module Balloon
             else
               markup = set_markup(n, @text_buffer[n])
             end
-            @layout.set_markup(markup, -1)
+            @layout.set_markup(markup)
             text_w, text_h = @layout.pixel_size
             w = text_w
             if x <= px and px < (x + w) and y <= py and py < (y + h)
@@ -1355,7 +1355,7 @@ module Balloon
         n = (i + 1)
         show unless @__shown
         markup = set_markup(index, text[p..n-1])
-        @layout.set_markup(markup, -1)
+        @layout.set_markup(markup)
         text_width, text_height =  @layout.pixel_size
         if text_width > @line_width
           @text_buffer << text[p..i-1]

--- a/lib/ninix/pix.rb
+++ b/lib/ninix/pix.rb
@@ -343,7 +343,7 @@ module Pix
     # the pixels method. Temporary use the read_pixel_bytes method and
     # create another Pixbuf.
     if is_pnr
-      pixels = pixbuf.read_pixel_bytes
+      pixels = pixbuf.read_pixel_bytes.to_s
       unless pixbuf.has_alpha?
         r, g, b = pixels[0, 3].bytes
         pixbuf = pixbuf.add_alpha(true, r, g, b)
@@ -363,12 +363,12 @@ module Pix
       path = File.join(head, basename + '.pna')
       if File.exists?(path)
         pna_pixbuf = pixbuf_new_from_file(path)
-        pix_na = NArray.to_na(pixbuf.read_pixel_bytes, NArray::BYTE)
+        pix_na = NArray.to_na(pixbuf.read_pixel_bytes.to_s, NArray::BYTE)
         pix_na.reshape!(4, pix_na.size / 4)
         unless pna_pixbuf.has_alpha?
           pna_pixbuf = pna_pixbuf.add_alpha(false, 0, 0, 0)
         end
-        pna_na = NArray.to_na(pna_pixbuf.read_pixel_bytes, NArray::BYTE)
+        pna_na = NArray.to_na(pna_pixbuf.read_pixel_bytes.to_s, NArray::BYTE)
         pna_na.reshape!(4, pna_na.size / 4)
         pix_na[3, true] = pna_na[0, true]
         pixbuf = GdkPixbuf::Pixbuf.new(