gir_ffi-gtk 0.13.0 → 0.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e84a1c1fb530cf07ca0c685de398c075279e5f0aad37d5b99d1cb1828baec9c
-  data.tar.gz: 92bb036950992713f0fe8ae0a46f0cffa9ec294581597f2eae19cfb19a85aa63
+  metadata.gz: ff690307c8af4d785db6460b4944c73e7f80b0a5d51e58516d2bd18ad18b27cc
+  data.tar.gz: c428003b8da3caa6e48f1b297c79f9c8482d8cbce82a1c05f0748572efa40af5
 SHA512:
-  metadata.gz: df68feccf33c8cba1025cd92448b3dd33535364c1abcbdec3b79cb9341d02aa14f8d165a3702f675d180631d013fa7385df374999957a480fbdfb7cd3f9cd444
-  data.tar.gz: 39e23cb92615d3bd685474147843540dc9cbaf25d2c4a127e939a00d773205696bdaefcbe01cbc86174c99c94a3d3ccb8fecde8766c98a424fc4f54e13345302
+  metadata.gz: e12f72f2b557f3e7b0ad3880775f4b9e1aacb34c7c9818f8c3c560d305a820bb50f5af9c69cd215c58d479aa60e7d4f7b15fca76a2a9e2291807b65c6d57fa1a
+  data.tar.gz: 2ffba95ce0d0dbf4771321eec7da295d5febee23ca10593eecde56c1a584757d19bbee37fbe4e5f2f5971470e5f8c84042875cefd982ce0356526ce75e4d4266

data/Changelog.md

@@ -3,6 +3,11 @@
 All notable changes to this project will be documented in this file. See the
 Git log for all changes.
 
+## 0.13.1 / 2018-09-24
+
+* Depend on GirFFI 0.13.1
+* Add overrides for some methods that take a Gtk::IconSize parameter
+
 ## 0.13.0 / 2018-09-08
 
 * Drop support for Ruby 2.1

data/lib/gir_ffi-gtk/action.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module GirFFIGtk
+  # Overrides for GtkAction
+  module ActionOverrides
+    def create_icon(icon_size)
+      super Gtk::IconSize.to_int(icon_size)
+    end
+  end
+end
+
+Gtk.load_class :Action
+Gtk::Action.prepend GirFFIGtk::ActionOverrides

data/lib/gir_ffi-gtk/base.rb

@@ -49,6 +49,7 @@ module GirFFIGtk
         ex = GLib::MainLoop::EXCEPTIONS.shift
         GLib::MainLoop::RUNNING_LOOPS.pop
         raise ex if ex
+
         result
       end
     end

data/lib/gir_ffi-gtk/gtk3/button.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module GirFFIGtk
+  # Overrides for GtkAction class methods
+  module ButtonClassOverrides
+    def new_from_icon_name(icon_name, size)
+      super icon_name, Gtk::IconSize.to_int(size)
+    end
+  end
+end
+
+Gtk.load_class :Button
+Gtk::Button.singleton_class.prepend GirFFIGtk::ButtonClassOverrides

data/lib/gir_ffi-gtk/image.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module GirFFIGtk
+  # Overrides for GtkImage methods
+  module ImageOverrides
+    def set_from_gicon(icon, size)
+      super icon, Gtk::IconSize.to_int(size)
+    end
+  end
+
+  # Overrides for GtkImage class methods
+  module ImageClassOverrides
+    def new_from_icon_name(icon_name, size)
+      super icon_name, Gtk::IconSize.to_int(size)
+    end
+
+    def new_from_gicon(icon, size)
+      super icon, Gtk::IconSize.to_int(size)
+    end
+  end
+end
+
+Gtk.load_class :Image
+
+Gtk::Image.prepend GirFFIGtk::ImageOverrides
+Gtk::Image.singleton_class.prepend GirFFIGtk::ImageClassOverrides

data/lib/gir_ffi-gtk2.rb

@@ -5,8 +5,11 @@ require 'gir_ffi'
 GirFFI.setup :Gtk, '2.0'
 
 require 'gir_ffi-gtk/base'
+
+require 'gir_ffi-gtk/action'
 require 'gir_ffi-gtk/builder'
 require 'gir_ffi-gtk/container'
+require 'gir_ffi-gtk/image'
 require 'gir_ffi-gtk/list_store'
 require 'gir_ffi-gtk/menu'
 require 'gir_ffi-gtk/message_dialog'

data/lib/gir_ffi-gtk3.rb

@@ -5,8 +5,11 @@ require 'gir_ffi'
 GirFFI.setup :Gtk, '3.0'
 
 require 'gir_ffi-gtk/base'
+
+require 'gir_ffi-gtk/action'
 require 'gir_ffi-gtk/builder'
 require 'gir_ffi-gtk/container'
+require 'gir_ffi-gtk/image'
 require 'gir_ffi-gtk/list_store'
 require 'gir_ffi-gtk/menu'
 require 'gir_ffi-gtk/message_dialog'
@@ -14,4 +17,5 @@ require 'gir_ffi-gtk/tree_path'
 require 'gir_ffi-gtk/tree_store'
 require 'gir_ffi-gtk/tree_view_column'
 
+require 'gir_ffi-gtk/gtk3/button'
 require 'gir_ffi-gtk/gtk3/target_entry'

data/test/gir_ffi-gtk/action_test.rb

@@ -0,0 +1,17 @@
+require 'test_helper'
+
+describe Gtk::Action do
+  let(:action) { Gtk::Action.new('hi', 'Hello', 'hey there', Gtk::STOCK_FILE) }
+
+  describe '#create_icon' do
+    it 'works when called with a symbol' do
+      result = action.create_icon :dialog
+      result.must_be_instance_of Gtk::Image
+    end
+
+    it 'works when called with an integer' do
+      result = action.create_icon 4
+      result.must_be_instance_of Gtk::Image
+    end
+  end
+end

data/test/gir_ffi-gtk/button_test.rb

@@ -0,0 +1,19 @@
+require 'test_helper'
+
+describe Gtk::Button do
+  describe '.new_from_icon_name' do
+    before do
+      skip if Gtk::MAJOR_VERSION == 2 || Gtk::MAJOR_VERSION == 3 && Gtk::MINOR_VERSION < 10
+    end
+
+    it 'works when called with a symbol' do
+      result = Gtk::Button.new_from_icon_name('hi', :dialog)
+      result.must_be_instance_of Gtk::Button
+    end
+
+    it 'works when called with an integer' do
+      result = Gtk::Button.new_from_icon_name('hi', 4)
+      result.must_be_instance_of Gtk::Button
+    end
+  end
+end

data/test/gir_ffi-gtk/image_test.rb

@@ -0,0 +1,43 @@
+require 'test_helper'
+
+describe Gtk::Image do
+  describe '.new_from_icon_name' do
+    it 'works when called with a symbol' do
+      result = Gtk::Image.new_from_icon_name('hi', :dialog)
+      result.must_be_instance_of Gtk::Image
+    end
+
+    it 'works when called with an integer' do
+      result = Gtk::Image.new_from_icon_name('hi', 4)
+      result.must_be_instance_of Gtk::Image
+    end
+  end
+
+  describe '.new_from_gicon' do
+    let(:gicon) { Gio::ThemedIcon.new('hi') }
+    it 'works when called with a symbol' do
+      result = Gtk::Image.new_from_gicon(gicon, :dialog)
+      result.must_be_instance_of Gtk::Image
+    end
+
+    it 'works when called with an integer' do
+      result = Gtk::Image.new_from_gicon(gicon, 4)
+      result.must_be_instance_of Gtk::Image
+    end
+  end
+
+  describe '#set_from_gicon' do
+    let(:gicon) { Gio::ThemedIcon.new('gnome') }
+    let(:image) { Gtk::Image.new }
+
+    it 'works when called with a symbol' do
+      image.set_from_gicon(gicon, :dialog)
+      image.get_gicon.must_equal [gicon, 6]
+    end
+
+    it 'works when called with an integer' do
+      image.set_from_gicon(gicon, 4)
+      image.get_gicon.must_equal [gicon, 4]
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gir_ffi-gtk
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.13.1
 platform: ruby
 authors:
 - Matijs van Zuijlen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-08 00:00:00.000000000 Z
+date: 2018-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gir_ffi
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: 0.13.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: 0.13.1
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -87,6 +87,7 @@ files:
 - examples/08_webkit_headless.rb
 - examples/09_webkit2_headless.rb
 - examples/10_completion_provider.rb
+- lib/gir_ffi-gtk/action.rb
 - lib/gir_ffi-gtk/base.rb
 - lib/gir_ffi-gtk/builder.rb
 - lib/gir_ffi-gtk/container.rb
@@ -95,7 +96,9 @@ files:
 - lib/gir_ffi-gtk/gtk2/radio_button.rb
 - lib/gir_ffi-gtk/gtk2/target_entry.rb
 - lib/gir_ffi-gtk/gtk2/tree_store.rb
+- lib/gir_ffi-gtk/gtk3/button.rb
 - lib/gir_ffi-gtk/gtk3/target_entry.rb
+- lib/gir_ffi-gtk/image.rb
 - lib/gir_ffi-gtk/list_store.rb
 - lib/gir_ffi-gtk/menu.rb
 - lib/gir_ffi-gtk/message_dialog.rb
@@ -106,10 +109,13 @@ files:
 - lib/gir_ffi-gtk3.rb
 - tasks/test.rake
 - test/callback_exceptions_test.rb
+- test/gir_ffi-gtk/action_test.rb
 - test/gir_ffi-gtk/base_test.rb
 - test/gir_ffi-gtk/builder_test.rb
+- test/gir_ffi-gtk/button_test.rb
 - test/gir_ffi-gtk/container_test.rb
 - test/gir_ffi-gtk/generated_gtk_test.rb
+- test/gir_ffi-gtk/image_test.rb
 - test/gir_ffi-gtk/list_store_test.rb
 - test/gir_ffi-gtk/menu_test.rb
 - test/gir_ffi-gtk/message_dialog_test.rb
@@ -146,10 +152,13 @@ specification_version: 4
 summary: GirFFI-based Ruby bindings for Gtk+ 2 and 3
 test_files:
 - test/callback_exceptions_test.rb
+- test/gir_ffi-gtk/action_test.rb
 - test/gir_ffi-gtk/base_test.rb
 - test/gir_ffi-gtk/builder_test.rb
+- test/gir_ffi-gtk/button_test.rb
 - test/gir_ffi-gtk/container_test.rb
 - test/gir_ffi-gtk/generated_gtk_test.rb
+- test/gir_ffi-gtk/image_test.rb
 - test/gir_ffi-gtk/list_store_test.rb
 - test/gir_ffi-gtk/menu_test.rb
 - test/gir_ffi-gtk/message_dialog_test.rb