glimmer-dsl-gtk 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f3230b55893dbd6faaa1a5ba29d191e0f55586d6d6147e5274286162d02d972c
-  data.tar.gz: ac79a95afc0e0f3cbaf37d501477beace1a810bdfdf82eb10d53d79094d2dedf
+  metadata.gz: c811aaa03169f5bb7754c7c07721bea6c1084d652878d55c75a9aa28f0fa6e56
+  data.tar.gz: 5c4ef408d97778f9defaa1f2fdd0df2f83e2d218fa0147317f8d3a68f69205f4
 SHA512:
-  metadata.gz: 8258cdcf3a83e552a8b24b4ed1d431b1c79414f5ff8c0f4a17779e40b95bd648c8470ca8fa54fcaf7622e34a534828cb137c543d9217ae83df5f969a0636beca
-  data.tar.gz: f01a32a3d485115028622c4235997c4018c369bf350fa23efbe6877a508afd047147c2f5a134e83367af007762d894f753ed2c3afb4bc2baddb7819ea42a7220
+  metadata.gz: 95e9f024283b4cb606f766f5230436d0caef9b55733ad7347cb45f3ef10e1d7d9555d375b177fe0d5d08091414572804f20b3ba9856f7946df7ccfc894b3428b
+  data.tar.gz: 0f381c56c69281dcd1bb9e6ec0391f58f101169da99e1c72ef14193425c7c3728b51cdd1b13169ac418d38ea3197c8adcc2c486b9586cd09aff4e07af2f86315

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Change Log
 
+## 0.0.7
+
+- samples/cairo/text.rb
+- Support for `path` nested `show_text`, `text_path`, `show_glyphs`, `glyph_path`, `new_sub_path` operations
+
 ## 0.0.6
 
 - samples/cairo/clip_image.rb
@@ -18,6 +23,7 @@
 - Support declarative `fill`/`paint` of `image, x, y` in cairo graphics
 - Support declarative transforms on cairo graphics shapes: `translate`, `scale`, `rotate`
 - Support applying transform on `drawing_area` `paint`
+- Support for `path` nested `rectangle`, `rounded_rectangle`, and `arc_negative` operations
 
 ## 0.0.5
 

data/README.md

@@ -1,9 +1,9 @@
-# [<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer/master/images/glimmer-logo-hi-res.png" height=85 />](https://github.com/AndyObtiva/glimmer) Glimmer DSL for GTK 0.0.6
+# [<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer/master/images/glimmer-logo-hi-res.png" height=85 />](https://github.com/AndyObtiva/glimmer) Glimmer DSL for GTK 0.0.7
 ## Ruby-GNOME Desktop Development GUI Library
 [![Gem Version](https://badge.fury.io/rb/glimmer-dsl-gtk.svg)](http://badge.fury.io/rb/glimmer-dsl-gtk)
 [![Join the chat at https://gitter.im/AndyObtiva/glimmer](https://badges.gitter.im/AndyObtiva/glimmer.svg)](https://gitter.im/AndyObtiva/glimmer?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
-[Glimmer](https://github.com/AndyObtiva/glimmer) DSL for [GTK](https://www.gtk.org/) enables building desktop applications with [Ruby-GNOME](https://github.com/ruby-gnome/ruby-gnome).
+[Glimmer](https://github.com/AndyObtiva/glimmer) DSL for [GTK](https://www.gtk.org/) enables building desktop applications with [Ruby-GNOME](https://github.com/ruby-gnome/ruby-gnome) (including [Cairo graphics](#declarative-cairo-graphics)).
 
 [GTK](https://www.gtk.org/) (aka GIMP-Toolkit or [incorrectly] GNOME-Toolkit) is the premiere desktop GUI toolkit on [Linux](https://www.gtk.org/docs/installations/linux/), which also runs on [Mac](https://www.gtk.org/docs/installations/macos/) ([Quartz GTK+](https://wiki.gnome.org/Projects/GTK/OSX)) and [Windows](https://www.gtk.org/docs/installations/windows).
 
@@ -80,7 +80,7 @@ gem install glimmer-dsl-gtk
 
 Add the following to `Gemfile`:
 ```
-gem 'glimmer-dsl-gtk', '~> 0.0.6'
+gem 'glimmer-dsl-gtk', '~> 0.0.7'
 ```
 
 And, then run:
@@ -820,6 +820,61 @@ window {
 
 ![Set line join](/screenshots/glimmer-dsl-gtk-mac-cairo-set-line-join.png)
 
+### Text
+
+[samples/cairo/text.rb](/samples/cairo/text.rb)
+
+```ruby
+require 'glimmer-dsl-gtk'
+
+include Glimmer
+
+window {
+  title 'Text'
+  default_size 256, 256
+  
+  drawing_area {
+    paint 242.25, 242.25, 242.25
+    
+    font_family = OS.linux? ? 'Sans' : (OS.mac? ? 'Helvetica' : 'Arial')
+    
+    # The main code
+    path {
+      move_to 10.0, 135.0
+      show_text 'Hello'
+      
+      font_face font_family, Cairo::FONT_SLANT_NORMAL, Cairo::FONT_WEIGHT_BOLD
+      font_size 90.0
+      line_width 2.56
+      fill 0, 0, 0
+      stroke 0, 0, 0
+    }
+    
+    path {
+      move_to 70.0, 165.0
+      text_path 'void'
+      
+      font_face font_family, Cairo::FONT_SLANT_NORMAL, Cairo::FONT_WEIGHT_BOLD
+      font_size 90.0
+      line_width 2.56
+      fill 127.5, 127.5, 255
+      stroke 0, 0, 0
+    }
+    
+    # draw helping lines
+    path {
+      arc 10.0, 135.0, 5.12, 0, 2*Math::PI
+      close_path
+      arc 70.0, 165.0, 5.12, 0, 2*Math::PI
+      
+      fill 255, 51, 51, 0.6
+    }
+  }
+}.show
+```
+
+![Text](/screenshots/glimmer-dsl-gtk-mac-cairo-text.png)
+
 ## Girb (Glimmer IRB)
 
 You can run the `girb` command (`bin/girb` if you cloned the project locally):

data/VERSION

@@ -1 +1 @@
-0.0.6
+0.0.7

data/lib/glimmer/gtk/shape/path.rb

@@ -93,6 +93,12 @@ module Glimmer
           cairo_context.set_matrix(previous_matrix)
         end
         
+        # TODO look into a way to generalize the declaration of the methods below (or perform code reuse)
+        
+        def new_sub_path(*args)
+          @drawing_operations << [:new_sub_path, args]
+        end
+      
         def arc(*args)
           @drawing_operations << [:arc, args]
         end
@@ -109,6 +115,22 @@ module Glimmer
           @drawing_operations << [:rounded_rectangle, args]
         end
       
+        def text_path(*args)
+          @drawing_operations << [:text_path, args]
+        end
+      
+        def show_text(*args)
+          @drawing_operations << [:show_text, args]
+        end
+      
+        def glyph_path(*args)
+          @drawing_operations << [:text_path, args]
+        end
+      
+        def show_glyphs(*args)
+          @drawing_operations << [:show_text, args]
+        end
+      
         def move_to(*args)
           @drawing_operations << [:move_to, args]
         end

data/lib/glimmer/gtk/shape.rb

@@ -125,12 +125,13 @@ module Glimmer
       prepend Transformable
       
       SHAPE_FILL_PROPERTIES = [:fill_rule]
-      SHAPE_STROKE_PROPERTIES = [:dash, :font_face, :font_matrix, :font_options, :font_size, :line_cap, :line_join, :line_width, :miter_limit, :scaled_font]
+      SHAPE_STROKE_PROPERTIES = [:dash, :line_cap, :line_join, :line_width, :miter_limit, :scaled_font]
       SHAPE_GENERAL_PROPERTIES = [:matrix, :operator, :tolerance]
+      SHAPE_FONT_PROPERTIES = [:font_face, :font_matrix, :font_options, :font_size]
       
       attr_reader :parent, :args, :keyword, :block
       attr_accessor :fill, :stroke, :clip
-      attr_accessor *(SHAPE_FILL_PROPERTIES + SHAPE_STROKE_PROPERTIES + SHAPE_GENERAL_PROPERTIES)
+      attr_accessor *(SHAPE_FILL_PROPERTIES + SHAPE_STROKE_PROPERTIES + SHAPE_GENERAL_PROPERTIES + SHAPE_FONT_PROPERTIES)
       # TODO consider automatically setting attribute accessors by looking up set_xyz methods on cairo context
       
       def initialize(keyword, parent, args, &block)
@@ -162,16 +163,19 @@ module Glimmer
       # Subclasses must either implement draw_shape hook method or override this method directly
       def draw(drawing_area_widget, cairo_context)
         if fill
+          draw_font(drawing_area_widget, cairo_context)
           draw_shape(drawing_area_widget, cairo_context)
           draw_fill(drawing_area_widget, cairo_context)
         end
         
         if stroke
+          draw_font(drawing_area_widget, cairo_context)
           draw_shape(drawing_area_widget, cairo_context)
           draw_stroke(drawing_area_widget, cairo_context)
         end
         
         if clip
+          draw_font(drawing_area_widget, cairo_context)
           draw_shape(drawing_area_widget, cairo_context)
           draw_clip(drawing_area_widget, cairo_context)
         end
@@ -194,19 +198,25 @@ module Glimmer
         previous_matrix = cairo_context.matrix
         apply_transforms(cairo_context, target: :fill)
         self.class.set_source_dynamically(cairo_context, fill)
-        (SHAPE_FILL_PROPERTIES + SHAPE_GENERAL_PROPERTIES).each do |property|
-          cairo_context.send("set_#{property}", *send(property)) if send(property)
+        (SHAPE_GENERAL_PROPERTIES + SHAPE_FILL_PROPERTIES).each do |property|
+          apply_property(cairo_context, property)
         end
         cairo_context.fill
         cairo_context.set_matrix(previous_matrix)
       end
       
+      def draw_font(drawing_area_widget, cairo_context)
+        SHAPE_FONT_PROPERTIES.each do |property|
+          apply_property(cairo_context, property)
+        end
+      end
+      
       def draw_stroke(drawing_area_widget, cairo_context)
         previous_matrix = cairo_context.matrix
         apply_transforms(cairo_context, target: :stroke)
         self.class.set_source_dynamically(cairo_context, stroke)
-        (SHAPE_STROKE_PROPERTIES + SHAPE_GENERAL_PROPERTIES).each do |property|
-          cairo_context.send("set_#{property}", *send(property)) if send(property)
+        (SHAPE_GENERAL_PROPERTIES + SHAPE_STROKE_PROPERTIES).each do |property|
+          apply_property(cairo_context, property)
         end
         cairo_context.stroke
         cairo_context.set_matrix(previous_matrix)
@@ -216,12 +226,22 @@ module Glimmer
         previous_matrix = cairo_context.matrix
         apply_transforms(cairo_context, target: :clip)
         SHAPE_GENERAL_PROPERTIES.each do |property|
-          cairo_context.send("set_#{property}", *send(property)) if send(property)
+          apply_property(cairo_context, property)
         end
         cairo_context.clip
         cairo_context.set_matrix(previous_matrix)
       end
       
+      def apply_property(cairo_context, property)
+        if send(property)
+          if property == :font_face
+            cairo_context.send("select_#{property}", *send(property))
+          else
+            cairo_context.send("set_#{property}", *send(property))
+          end
+        end
+      end
+      
       def respond_to?(method_name, include_private = false, &block)
         method_name = method_name.to_s
         (method_name.start_with?('set_') && super("#{method_name.sub('set_', '')}=", include_private)) ||

data/samples/cairo/text.rb

@@ -0,0 +1,46 @@
+require 'glimmer-dsl-gtk'
+
+include Glimmer
+
+window {
+  title 'Text'
+  default_size 256, 256
+  
+  drawing_area {
+    paint 242.25, 242.25, 242.25
+    
+    font_family = OS.linux? ? 'Sans' : (OS.mac? ? 'Helvetica' : 'Arial')
+    
+    # The main code
+    path {
+      move_to 10.0, 135.0
+      show_text 'Hello'
+      
+      font_face font_family, Cairo::FONT_SLANT_NORMAL, Cairo::FONT_WEIGHT_BOLD
+      font_size 90.0
+      line_width 2.56
+      fill 0, 0, 0
+      stroke 0, 0, 0
+    }
+    
+    path {
+      move_to 70.0, 165.0
+      text_path 'void'
+      
+      font_face font_family, Cairo::FONT_SLANT_NORMAL, Cairo::FONT_WEIGHT_BOLD
+      font_size 90.0
+      line_width 2.56
+      fill 127.5, 127.5, 255
+      stroke 0, 0, 0
+    }
+    
+    # draw helping lines
+    path {
+      arc 10.0, 135.0, 5.12, 0, 2*Math::PI
+      close_path
+      arc 70.0, 165.0, 5.12, 0, 2*Math::PI
+      
+      fill 255, 51, 51, 0.6
+    }
+  }
+}.show

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-gtk
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Andy Maleh
@@ -142,7 +142,8 @@ dependencies:
     - - ">"
       - !ruby/object:Gem::Version
         version: '0'
-description: Glimmer DSL for GTK - Ruby-GNOME Desktop Development GUI Library
+description: Glimmer DSL for GTK - Ruby-GNOME Desktop Development GUI Library - Supports
+  all GTK widgets and Cairo graphics
 email: andy.am@gmail.com
 executables:
 - girb
@@ -202,6 +203,7 @@ files:
 - samples/cairo/rounded_rectangle.rb
 - samples/cairo/set_line_cap.rb
 - samples/cairo/set_line_join.rb
+- samples/cairo/text.rb
 - samples/elaborate/tetris.rb
 - samples/elaborate/tetris/model/block.rb
 - samples/elaborate/tetris/model/game.rb