nyle 0.6.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9dcd520326cf46949be1823ade42380cdd10da5f6018f6cad5bf9d699cb15e59
-  data.tar.gz: c5e0eb9530dfd5db88fbe4c04b4ca30c411f3344c299b03ae87ff24961fc2dbb
+  metadata.gz: a33dd14f3c5ebe3aca4a68321822a9f9e43cae7cc241762d1565c5958deb70a2
+  data.tar.gz: 07f1ef3ff7c4ecb06a458434085946bd891615fcc636e07fa5fddb75b07e98ef
 SHA512:
-  metadata.gz: a7f64c6526220dd9be63dafd38f55af02b73d1759252fdbd968bc36946c65712df3ff1816ed658525f53e6c210befdb0a704e73966ed75e0e4353958fcd25ff3
-  data.tar.gz: 545b7ca4dcbe72dad395ec6c6e364bed3f90ea0075f6743b1c855f2a9c9506edd518839484afadf6bf64e9ec45a1b7865a9ec3b01538d52d8b7c46b134c77aba
+  metadata.gz: 80f2cb71e85a567a9b6d36ac41ec21f9fb6b55fbe1863a645ccd83e150af46ebc14a70c24ba7216954f720913a8dc14475c6858e49451c6c7afacf4c91a3d1ac
+  data.tar.gz: ef83253f3dfe474d064940cf51ba2f20d1e299c3b51633509777995acffda7f6d80f10d34713b3f1754ea8177942de057f7b11b0911873881de129cb230f6849

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+### 0.7.0 (2019/02/09)
+#### New features
+* enhance `draw_text` to be able to specify font attributes(font-name, italic, bold)
+* change implementation of `draw_text` to use `show_pango_layout` instead of `show_text`
+
+#### Bug fixes, etc.
+* adjust `nyle.gemspec`
+
+#### Samples
+* revise `draw_text.rb`
+* ...and adjust other samples a little
+
+
 ### 0.6.1 (2019/01/27)
 #### New features
 * add `Nyle.cursor_x` method

data/README.md

@@ -4,7 +4,7 @@
 
 ## Requirements
 
-* Ruby/GTK3
+Ruby/GTK3 >= 3.3.0
 
 ## Installation
 
@@ -12,6 +12,10 @@ Install it yourself as:
 
     $ gem install nyle
 
+If using `gtk3-3.3.0` on Windows, you need the following further.
+
+    $ gem install rsvg2 -v 3.3.0
+
 ## Usage
 
 ```ruby
@@ -20,11 +24,12 @@ require 'nyle'
 
 ## Documents
 
-Reference manual: https://github.com/spoolkitamura/nyle/wiki
+https://github.com/spoolkitamura/nyle/wiki  
 
 ## Samples
 
-Sample programs: https://github.com/spoolkitamura/nyle/tree/master/samples
+https://github.com/spoolkitamura/nyle/tree/master/samples  
+https://github.com/spoolkitamura/nyle/wiki/Samples  
 
 ## License
 

data/lib/nyle/version.rb

@@ -1,3 +1,3 @@
 module Nyle
-  VERSION = "0.6.1"
+  VERSION = "0.7.0"
 end

data/lib/nyle.rb

@@ -246,16 +246,24 @@ module Nyle
     end
   end
 
-  module_function def draw_text(x, y, str, size: 32, color: :BLACK, a: 1.0)
+  module_function def draw_text(x, y, str, size: 32, color: :BLACK, a: 1.0, font: "sans-serif", italic: false, bold: false)
     cr = Nyle.module_eval{ @__cr }
     cr.save do
-      cr.select_font_face("+")   # Temporaly use "+"  [TODO] (Need to confirm font name)
-      cr.font_size = size
-      cr.set_source_rgba(Cairo::Color.parse(color).r, 
-                         Cairo::Color.parse(color).g, 
+      pango_layout = cr.create_pango_layout
+      pango_layout.text = str
+      font_description        = Pango::FontDescription.new
+      font_description.family = font
+      font_description.style  = :italic if italic
+      font_description.weight = 700 if bold
+      font_description.size   = size * (72.0 / 96.0) * Pango::SCALE
+      pango_layout.font_description = font_description
+      cr.update_pango_layout(pango_layout)
+      cr.set_source_rgba(Cairo::Color.parse(color).r,
+                         Cairo::Color.parse(color).g,
                          Cairo::Color.parse(color).b, a)
-      cr.move_to(x, y)
-      cr.show_text(str)
+      delta = (Nyle.module_eval{ @__os } == :mac ? size * (72.0 / 96.0) : size)
+      cr.move_to(x, y - delta)   # Why :mac?
+      cr.show_pango_layout(pango_layout)
     end
   end
 

data/nyle.gemspec

@@ -36,9 +36,9 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.17"
-  spec.add_development_dependency "rake", "~> 10.0"
+  #spec.add_development_dependency "bundler", "~> 1.17"
+  #spec.add_development_dependency "rake", "~> 10.0"
 
   spec.add_runtime_dependency "gtk3", "~> 3.3.0", ">= 3.3.0"
-  spec.add_runtime_dependency "rsvg2", "~> 3.3.0", ">= 3.3.0"
+  #spec.add_runtime_dependency "rsvg2", "~> 3.3.0", ">= 3.3.0"
 end

data/samples/application/sugar.rb

@@ -41,7 +41,7 @@ class Screen < Nyle::Screen
   BGCOLOR = :BLACK
 
   def initialize
-    super(120, 240, {bgcolor: BGCOLOR, trace: true})
+    super(240, 240, {bgcolor: BGCOLOR, trace: true})
     @dots = []
   end
 
@@ -49,7 +49,7 @@ class Screen < Nyle::Screen
     x, y = Nyle.mouse_x, Nyle.mouse_y
     Nyle.draw_circle(x, y, 5, {color: FGCOLOR, fill: true}) if Nyle.mouse_down?(MOUSE_L)
     Nyle.draw_circle(x, y, 5, {color: BGCOLOR, fill: true}) if Nyle.mouse_down?(MOUSE_R)
-    @dots << Dot.new(rand(20) + 50, 0) if @dots.size <= 300   # create dots (limit = 300)
+    @dots << Dot.new(rand(20) + 110, 0) if @dots.size <= 300   # create dots (limit = 300)
     @dots.delete_if do |dot|
       dot.move                                                # move dots
     end

data/samples/basic/color_chart.rb

@@ -33,12 +33,6 @@ class Screen < Nyle::Screen
       @start_index = 0 if @start_index >= @colors.length
     end
 
-    if Nyle.key_press?(KEY_space)
-      @colors.each do |c|
-        puts "#{Cairo::Color.parse(c).to_s} (#{c.to_s})"
-      end
-    end
-
     Nyle.quit if Nyle.key_press?(KEY_Escape)
   end
 

data/samples/basic/color_pixel.rb

@@ -16,11 +16,11 @@ class Screen < Nyle::Screen
 
     x, y = Nyle.mouse_x, Nyle.mouse_y
     if Nyle.pixel?(x, y, :WHITE)
-      Nyle.draw_text(10, 220, 'Move mouse cursor over any tile', {size: 16})
+      Nyle.draw_text(10, 220, 'Move mouse pointer over any tile', {size: 14})
     else
       color = Nyle.pixel(x, y)
       info = "(x=%3d, y=%3d)  %s" % [x, y, color]
-      Nyle.draw_text(10, 220, info, {size: 20, color: color})
+      Nyle.draw_text(10, 220, info, {size: 18, color: color})
     end
 
     Nyle.quit if Nyle.key_press?(KEY_Escape)

data/samples/basic/draw_text.rb

@@ -6,44 +6,52 @@ class Screen < Nyle::Screen
   end
 
   def draw
-    Nyle.draw_text( 80,  70, "Nyle", {size: 16})
-    Nyle.draw_text(140,  70, "Nyle", {size: 24})
-    Nyle.draw_text(220,  70, "Nyle", {size: 32})
-    Nyle.draw_text(320,  70, "Nyle", {size: 40})
-    Nyle.draw_text(440,  70, "Nyle", {size: 48})
-
-    Nyle.draw_text( 80, 120, "Nyle", {size: 16, a: 1.0})
-    Nyle.draw_text(140, 120, "Nyle", {size: 24, a: 0.8})
-    Nyle.draw_text(220, 120, "Nyle", {size: 32, a: 0.6})
-    Nyle.draw_text(320, 120, "Nyle", {size: 40, a: 0.4})
-    Nyle.draw_text(440, 120, "Nyle", {size: 48, a: 0.2})
-
-    Nyle.draw_text( 80, 170, "Nyle", {size: 16, color: :RED})
-    Nyle.draw_text(140, 170, "Nyle", {size: 24, color: :RED})
-    Nyle.draw_text(220, 170, "Nyle", {size: 32, color: :RED})
-    Nyle.draw_text(320, 170, "Nyle", {size: 40, color: :RED})
-    Nyle.draw_text(440, 170, "Nyle", {size: 48, color: :RED})
-
-    Nyle.draw_text( 80, 220, "Nyle", {size: 16, color: :FOREST_GREEN})
-    Nyle.draw_text(140, 220, "Nyle", {size: 24, color: :FOREST_GREEN})
-    Nyle.draw_text(220, 220, "Nyle", {size: 32, color: :FOREST_GREEN})
-    Nyle.draw_text(320, 220, "Nyle", {size: 40, color: :FOREST_GREEN})
-    Nyle.draw_text(440, 220, "Nyle", {size: 48, color: :FOREST_GREEN})
-
-    Nyle.draw_text( 80, 270, "Nyle", {size: 16, color: :COBALT})
-    Nyle.draw_text(140, 270, "Nyle", {size: 24, color: :COBALT})
-    Nyle.draw_text(220, 270, "Nyle", {size: 32, color: :COBALT})
-    Nyle.draw_text(320, 270, "Nyle", {size: 40, color: :COBALT})
-    Nyle.draw_text(440, 270, "Nyle", {size: 48, color: :COBALT})
-
-    Nyle.draw_text( 80, 320, "Nyle", {size: 16, color: :GOLD})
-    Nyle.draw_text(140, 320, "Nyle", {size: 24, color: :GOLD})
-    Nyle.draw_text(220, 320, "Nyle", {size: 32, color: :GOLD})
-    Nyle.draw_text(320, 320, "Nyle", {size: 40, color: :GOLD})
-    Nyle.draw_text(440, 320, "Nyle", {size: 48, color: :GOLD})
-
-    Nyle.draw_text( 80, 390, "minimal graphics framework", {size: 24, a: 0.8})
-    Nyle.draw_text(110, 420, "using Ruby/GTK3 and rcairo",   {size: 24, a: 0.8})
+    Nyle.draw_line( 20, 410, 620, 410, {color: :GRAY, a: 0.1})
+    Nyle.draw_line( 20, 440, 620, 440, {color: :GRAY, a: 0.1})
+    Nyle.draw_text( 80, 410, "minimal graphics framework", {size: 24})
+    Nyle.draw_text(120, 440, "using Ruby/GTK3 and rcairo", {size: 24})
+
+    Nyle.draw_line( 20,  50, 620,  50, {color: :GRAY, a: 0.1})
+    Nyle.draw_text( 80,  50, "Nyle", {size: 18, font: "sans-serif"})
+    Nyle.draw_text(140,  50, "Nyle", {size: 24, font: "sans-serif"})
+    Nyle.draw_text(220,  50, "Nyle", {size: 32, font: "sans-serif", bold: true})
+    Nyle.draw_text(320,  50, "Nyle", {size: 42, font: "sans-serif", italic: true})
+    Nyle.draw_text(440,  50, "Nyle", {size: 48, font: "sans-serif", italic: true, bold: true})
+
+    Nyle.draw_line( 20, 110, 620, 110, {color: :GRAY, a: 0.1})
+    Nyle.draw_text( 80, 110, "Nyle", {size: 18, a: 1.0, font: "sans-serif"})
+    Nyle.draw_text(140, 110, "Nyle", {size: 24, a: 0.8, font: "sans-serif"})
+    Nyle.draw_text(220, 110, "Nyle", {size: 32, a: 0.6, font: "sans-serif", bold: true})
+    Nyle.draw_text(320, 110, "Nyle", {size: 42, a: 0.4, font: "sans-serif", italic: true})
+    Nyle.draw_text(440, 110, "Nyle", {size: 48, a: 0.2, font: "sans-serif", italic: true, bold: true})
+
+    Nyle.draw_line( 20, 170, 620, 170, {color: :GRAY, a: 0.1})
+    Nyle.draw_text( 80, 170, "Nyle", {size: 18, color: :RED, font: "serif"})
+    Nyle.draw_text(140, 170, "Nyle", {size: 24, color: :RED, font: "serif"})
+    Nyle.draw_text(220, 170, "Nyle", {size: 32, color: :RED, font: "serif", bold: true})
+    Nyle.draw_text(320, 170, "Nyle", {size: 42, color: :RED, font: "serif", italic: true})
+    Nyle.draw_text(440, 170, "Nyle", {size: 48, color: :RED, font: "serif", italic: true, bold: true})
+
+    Nyle.draw_line( 20, 230, 620, 230, {color: :GRAY, a: 0.1})
+    Nyle.draw_text( 80, 230, "Nyle", {size: 18, color: :FOREST_GREEN, font: "serif"})
+    Nyle.draw_text(140, 230, "Nyle", {size: 24, color: :FOREST_GREEN, font: "serif"})
+    Nyle.draw_text(220, 230, "Nyle", {size: 32, color: :FOREST_GREEN, font: "serif", bold: true})
+    Nyle.draw_text(320, 230, "Nyle", {size: 42, color: :FOREST_GREEN, font: "serif", italic: true})
+    Nyle.draw_text(440, 230, "Nyle", {size: 48, color: :FOREST_GREEN, font: "serif", italic: true, bold: true})
+
+    Nyle.draw_line( 20, 290, 620, 290, {color: :GRAY, a: 0.1})
+    Nyle.draw_text( 80, 290, "Nyle", {size: 18, color: :COBALT, font: "monospace"})
+    Nyle.draw_text(140, 290, "Nyle", {size: 24, color: :COBALT, font: "monospace"})
+    Nyle.draw_text(220, 290, "Nyle", {size: 32, color: :COBALT, font: "monospace", bold: true})
+    Nyle.draw_text(320, 290, "Nyle", {size: 42, color: :COBALT, font: "monospace", italic: true})
+    Nyle.draw_text(440, 290, "Nyle", {size: 48, color: :COBALT, font: "monospace", italic: true, bold: true})
+
+    Nyle.draw_line( 20, 350, 620, 350, {color: :GRAY, a: 0.1})
+    Nyle.draw_text( 80, 350, "Nyle", {size: 18, color: :GOLD, font: "monospace"})
+    Nyle.draw_text(140, 350, "Nyle", {size: 24, color: :GOLD, font: "monospace"})
+    Nyle.draw_text(220, 350, "Nyle", {size: 32, color: :GOLD, font: "monospace", bold: true})
+    Nyle.draw_text(320, 350, "Nyle", {size: 42, color: :GOLD, font: "monospace", italic: true})
+    Nyle.draw_text(440, 350, "Nyle", {size: 48, color: :GOLD, font: "monospace", italic: true, bold: true})
 
     Nyle.quit if Nyle.key_press?(KEY_Escape)
   end

data/samples/basic/image_rotate.rb

@@ -2,7 +2,7 @@ require 'nyle'
 
 class Screen < Nyle::Screen
   def initialize
-    super
+    super({bgcolor: :ALICE_BLUE})
     @image1 = Nyle.load_image("../image/n_b_crocodile.png")
     @th = 0
   end

data/samples/basic/keyboard.rb

@@ -2,7 +2,7 @@ require 'nyle'
 
 class Screen < Nyle::Screen
   def initialize
-    super(200, 200)
+    super(200, 200, {bgcolor: :IVORY})
   end
 
   def draw
@@ -16,8 +16,8 @@ class Screen < Nyle::Screen
     stat = "[escape]"    if Nyle.key_down?(KEY_Escape)
     stat = "[left]"      if Nyle.key_down?(KEY_Left)
     stat = "[up]"        if Nyle.key_down?(KEY_Up)
-    stat = "[down]"      if Nyle.key_down?(KEY_Right)
-    stat = "[right]"     if Nyle.key_down?(KEY_Down)
+    stat = "[down]"      if Nyle.key_down?(KEY_Down)
+    stat = "[right]"     if Nyle.key_down?(KEY_Right)
     stat = "[insert]"    if Nyle.key_down?(KEY_Insert)
     stat = "[delete]"    if Nyle.key_down?(KEY_Delete)
     stat = "[home]"      if Nyle.key_down?(KEY_Home)

data/samples/launcher.rb

@@ -16,8 +16,9 @@ module Samples
       text_window.add(@text)
 
       hpaned = Gtk::Paned.new(:horizontal)
-      hpaned.add(tree_window, resize: true, shrink: false)
-      hpaned.add(text_window, resize: true, shrink: false)
+      hpaned.add(tree_window, resize: false, shrink: false)
+      hpaned.add(text_window, resize: true,  shrink: false)
+      hpaned.position = 240
 
       self.add(hpaned)
       self.set_size_request(640, 640)
@@ -55,7 +56,9 @@ module Samples
 
     def create_text
       text_view = Gtk::TextView.new
-      text_view.override_font(Pango::FontDescription.new('Monospace 10'))
+      font_description = Pango::FontDescription.new('Monospace')
+      font_description.size = (/darwin|mac os/ === RUBY_PLATFORM ? 13.3 : 10) * Pango::SCALE
+      text_view.override_font(font_description)
       text_view.set_wrap_mode(:none)
       text_view.set_editable(false)
       text_view.set_cursor_visible(false)

metadata

@@ -1,43 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: nyle
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
 platform: ruby
 authors:
 - Koki Kitamura
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-26 00:00:00.000000000 Z
+date: 2019-02-09 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.17'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.17'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
 - !ruby/object:Gem::Dependency
   name: gtk3
   requirement: !ruby/object:Gem::Requirement
@@ -58,26 +30,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.3.0
-- !ruby/object:Gem::Dependency
-  name: rsvg2
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.3.0
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.3.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.3.0
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.3.0
 description: "'Nyle' is a minimal graphics framework using Ruby/GTK3 and rcairo"
 email:
 - spool.kitamura@nifty.ne.jp
@@ -85,10 +37,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
 - CHANGELOG.md
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile

data/.gitignore

@@ -1,9 +0,0 @@
-desktop.ini
-*.gem
-bin/
-pkg/
-samples/.bundle/
-samples/_RC
-samples/Gemfile
-samples/Gemfile.lock
-samples/application/sketch.png

data/Gemfile.lock

@@ -1,61 +0,0 @@
-PATH
-  remote: .
-  specs:
-    nyle (0.6.0)
-      gtk3 (~> 3.2.0, >= 3.2.0)
-      rsvg2 (~> 3.2.0, >= 3.2.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    atk (3.2.9-x86-mingw32)
-      glib2 (= 3.2.9)
-    cairo (1.15.13-x86-mingw32)
-      native-package-installer (>= 1.0.3)
-      pkg-config (>= 1.2.2)
-    cairo-gobject (3.2.9-x86-mingw32)
-      cairo
-      glib2 (= 3.2.9)
-    gdk3 (3.2.9-x86-mingw32)
-      cairo-gobject (= 3.2.9)
-      gdk_pixbuf2 (= 3.2.9)
-      pango (= 3.2.9)
-    gdk_pixbuf2 (3.2.9-x86-mingw32)
-      gio2 (= 3.2.9)
-    gio2 (3.2.9-x86-mingw32)
-      glib2 (= 3.2.9)
-      gobject-introspection (= 3.2.9)
-    glib2 (3.2.9-x86-mingw32)
-      cairo (>= 1.15.9)
-      native-package-installer (>= 1.0.3)
-      pkg-config (>= 1.2.2)
-    gobject-introspection (3.2.9-x86-mingw32)
-      glib2 (= 3.2.9)
-    gtk3 (3.2.9-x86-mingw32)
-      atk (= 3.2.9)
-      gdk3 (= 3.2.9)
-      gdk_pixbuf2 (= 3.2.9)
-      gio2 (= 3.2.9)
-      pango (= 3.2.9)
-      rsvg2 (= 3.2.9)
-    native-package-installer (1.0.6)
-    pango (3.2.9-x86-mingw32)
-      cairo-gobject (= 3.2.9)
-      gobject-introspection (= 3.2.9)
-    pkg-config (1.3.2)
-    rake (10.4.2)
-    rsvg2 (3.2.9-x86-mingw32)
-      cairo-gobject (= 3.2.9)
-      gdk_pixbuf2 (= 3.2.9)
-      pango (>= 3.2.9)
-
-PLATFORMS
-  x86-mingw32
-
-DEPENDENCIES
-  bundler (~> 1.17)
-  nyle!
-  rake (~> 10.0)
-
-BUNDLED WITH
-   1.17.1