glimmer-dsl-gtk 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 24b62b2f4e0a04f84595c76365e2fb324d1b94dcd956e185b5a0f3f20665f333
-  data.tar.gz: 87363190b99d77589cf76be2a9035d77313a3cc64c3e431c0ec64dd0cb8f6c84
+  metadata.gz: f3230b55893dbd6faaa1a5ba29d191e0f55586d6d6147e5274286162d02d972c
+  data.tar.gz: ac79a95afc0e0f3cbaf37d501477beace1a810bdfdf82eb10d53d79094d2dedf
 SHA512:
-  metadata.gz: cff0baef7fb9455823af170bb63bee5059b297741b1994024d7c99c9140d77c5b13ac27e06fb1861561742da3f09d74513eefe46d64e893856f938f829749bf0
-  data.tar.gz: 83c024c42ecbaa1928c7909d31bbcf43ead432a1b5c4852909511a155668935c2ccbd18f819082eeaacc2a84000a4b88d0386e5b795b7d2e670fae9e11072362
+  metadata.gz: 8258cdcf3a83e552a8b24b4ed1d431b1c79414f5ff8c0f4a17779e40b95bd648c8470ca8fa54fcaf7622e34a534828cb137c543d9217ae83df5f969a0636beca
+  data.tar.gz: f01a32a3d485115028622c4235997c4018c369bf350fa23efbe6877a508afd047147c2f5a134e83367af007762d894f753ed2c3afb4bc2baddb7819ea42a7220

data/CHANGELOG.md

@@ -1,5 +1,24 @@
 # Change Log
 
+## 0.0.6
+
+- samples/cairo/clip_image.rb
+- samples/cairo/curve_to.rb
+- samples/cairo/dashes.rb
+- samples/cairo/fill_and_stroke2.rb
+- samples/cairo/fill_style.rb
+- samples/cairo/gradient.rb
+- samples/cairo/image.rb
+- samples/cairo/image_gradient.rb
+- samples/cairo/multi_segment_caps.rb
+- samples/cairo/rounded_rectangle.rb
+- samples/cairo/set_line_cap.rb
+- samples/cairo/set_line_join.rb
+- Supported nested sub-paths (nesting `path` within another `path`)
+- 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`
+
 ## 0.0.5
 
 - Support `drawing_area#paint(red, green, blue)` operation to set the initial `drawing_area` paint color base

data/README.md

@@ -1,4 +1,4 @@
-# [<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.5
+# [<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
 ## 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)
@@ -80,7 +80,7 @@ gem install glimmer-dsl-gtk
 
 Add the following to `Gemfile`:
 ```
-gem 'glimmer-dsl-gtk', '~> 0.0.5'
+gem 'glimmer-dsl-gtk', '~> 0.0.6'
 ```
 
 And, then run:
@@ -152,13 +152,13 @@ Note that it is usually recommended to observe external model objects (not `self
 
 [Cairo](https://www.cairographics.org/) is the engine behind drawing arbitrary 2D geometric shapes in [GTK](https://www.gtk.org/).
 
-In [Glimmer DSL for GTK](https://rubygems.org/gems/glimmer-dsl-gtk), you can draw Cairo shapes declaratively in a way similar to how SVG works, but using one language; Ruby, thus being able to utilize Ruby logic (e.g. if statement or each loop) with it effortlessly when needed.
+In [Glimmer DSL for GTK](https://rubygems.org/gems/glimmer-dsl-gtk), you can draw Cairo shapes declaratively in a way similar to how SVG works, but using one language; Ruby, thus being able to utilize Ruby logic (e.g. if statement or each loop) with it effortlessly when needed. Declarative syntax also yields less code that is simpler, not dependent on ordering of nested properties, and more understandable/maintainable.
 
 Below is a quick tutorial consisting of samples inspired and ported from [Mohit Sindhwani's blog post "Cairo with Ruby - Samples using RCairo"](https://notepad.onghu.com/2021/cairo-samples-in-ruby/).
 
 ### Arc
 
-Example (you may copy/paste in [`girb`](#girb-glimmer-irb))
+[samples/cairo/arc.rb](/samples/cairo/arc.rb)
 
 ```ruby
 require 'glimmer-dsl-gtk'
@@ -211,7 +211,7 @@ window {
 
 ### Arc Negative
 
-Example (you may copy/paste in [`girb`](#girb-glimmer-irb))
+[samples/cairo/arc_negative.rb](/samples/cairo/arc_negative.rb)
 
 ```ruby
 require 'glimmer-dsl-gtk'
@@ -264,7 +264,7 @@ window {
 
 ### Clip
 
-Example (you may copy/paste in [`girb`](#girb-glimmer-irb))
+[samples/cairo/clip.rb](/samples/cairo/clip.rb)
 
 ```ruby
 require 'glimmer-dsl-gtk'
@@ -305,6 +305,521 @@ window {
 
 ![Clip](/screenshots/glimmer-dsl-gtk-mac-cairo-clip.png)
 
+### Clip Image
+
+[samples/cairo/clip_image.rb](/samples/cairo/clip_image.rb)
+
+```ruby
+require 'glimmer-dsl-gtk'
+
+include Glimmer
+
+window {
+  title 'Clip Image'
+  default_size 256, 256
+  
+  drawing_area {
+    paint 242.25, 242.25, 242.25
+
+    arc(128.0, 128.0, 76.8, 0, 2 * Math::PI) {
+      clip true # designate arc as the clipping area
+    }
+
+    rectangle(0, 0, 256, 256) {
+      # Source image is from:
+      # - https://www.publicdomainpictures.net/en/view-image.php?image=7683&picture=breaking-blue-wave
+      # Converted to PNG before using it
+      image = Cairo::ImageSurface.from_png(File.expand_path(File.join('..', '..', 'images', 'breaking-blue-wave.png'), __dir__))
+      w = image.width
+      h = image.height
+  
+      scale 256.0/w, 256.0/h, exclude: :shape # applies scale to fill source image only
+      fill image, 0, 0
+    }
+  }
+}.show
+```
+
+![Clip Image](/screenshots/glimmer-dsl-gtk-mac-cairo-clip-image.png)
+
+### Curve to
+
+[samples/cairo/curve_to.rb](/samples/cairo/curve_to.rb)
+
+```ruby
+require 'glimmer-dsl-gtk'
+
+include Glimmer
+
+window {
+  title 'Curve to'
+  default_size 256, 256
+  
+  drawing_area {
+    paint 242.25, 242.25, 242.25
+    
+    x=25.6
+    y=128.0
+    x1=102.4
+    y1=230.4
+    x2=153.6
+    y2=25.6
+    x3=230.4
+    y3=128.0
+    
+    path {
+      move_to x, y
+      curve_to x1, y1, x2, y2, x3, y3
+      
+      line_width 10
+      stroke 0, 0, 0
+    }
+    
+    path {
+      move_to x,y
+      line_to x1,y1
+      move_to x2,y2
+      line_to x3,y3
+      
+      line_width 6
+      stroke 255, 51, 51, 0.6
+    }
+  }
+}.show
+```
+
+![Curve to](/screenshots/glimmer-dsl-gtk-mac-cairo-curve-to.png)
+
+### Dashes
+
+[samples/cairo/dashes.rb](/samples/cairo/dashes.rb)
+
+```ruby
+require 'glimmer-dsl-gtk'
+
+include Glimmer
+
+window {
+  title 'Dashes'
+  default_size 256, 256
+  
+  drawing_area {
+    paint 242.25, 242.25, 242.25
+
+    dashes = [ 50.0, # ink
+                       10.0,  # skip
+                       10.0,  # ink
+                       10.0   # skip
+            ]
+    offset = -50.0
+    
+    path {
+      move_to 128.0, 25.6
+      line_to 230.4, 230.4
+      rel_line_to -102.4, 0.0
+      curve_to 51.2, 230.4, 51.2, 128.0, 128.0, 128.0
+      
+      line_width 10
+      dash dashes, offset
+      stroke 0, 0, 0
+    }
+  }
+}.show
+```
+
+![Dashes](/screenshots/glimmer-dsl-gtk-mac-cairo-dashes.png)
+
+### Fill and Stroke 2
+
+(note: there is no Fill and Stroke 1; this was adopted from [Mohit's blog post](https://notepad.onghu.com/2021/cairo-samples-in-ruby/), which only mentioned Fill and Stroke 2)
+
+[samples/cairo/fill_and_stroke2.rb](/samples/cairo/fill_and_stroke2.rb)
+
+```ruby
+require 'glimmer-dsl-gtk'
+
+include Glimmer
+
+window {
+  title 'Fill and Stroke 2'
+  default_size 256, 256
+  
+  drawing_area {
+    paint 242.25, 242.25, 242.25
+    
+    path {
+      move_to 128.0, 25.6
+      line_to 230.4, 230.4
+      rel_line_to -102.4, 0.0
+      curve_to 51.2, 230.4, 51.2, 128.0, 128.0, 128.0
+      close_path
+
+      fill 0, 0, 255
+      stroke 0, 0, 0
+      line_width 10
+    }
+    
+    path {
+      move_to 64.0, 25.6
+      rel_line_to 51.2, 51.2
+      rel_line_to -51.2, 51.2
+      rel_line_to -51.2, -51.2
+      close_path
+
+      fill 0, 0, 255
+      stroke 0, 0, 0
+      line_width 10
+    }
+  }
+}.show
+```
+
+![Fill and Stroke 2](/screenshots/glimmer-dsl-gtk-mac-cairo-fill-and-stroke2.png)
+
+### Fill Style
+
+[samples/cairo/fill_style.rb](/samples/cairo/fill_style.rb)
+
+```ruby
+require 'glimmer-dsl-gtk'
+
+include Glimmer
+
+window {
+  title 'Fill Style'
+  default_size 256, 256
+  
+  drawing_area {
+    paint 242.25, 242.25, 242.25
+    
+    path {
+      rectangle 12, 12, 232, 70
+      path { # sub-path
+        arc 64, 64, 40, 0, 2*Math::PI
+      }
+      path { # sub-path
+        arc_negative 192, 64, 40, 0, -2*Math::PI
+      }
+      
+      fill_rule Cairo::FILL_RULE_EVEN_ODD
+      line_width 6
+      fill 0, 178.5, 0
+      stroke 0, 0, 0
+    }
+    
+    path {
+      rectangle 12, 12, 232, 70
+      path { # sub-path
+        arc 64, 64, 40, 0, 2*Math::PI
+      }
+      path { # sub-path
+        arc_negative 192, 64, 40, 0, -2*Math::PI
+      }
+      
+      translate 0, 128
+      fill_rule Cairo::FILL_RULE_WINDING
+      line_width 6
+      fill 0, 0, 229.5
+      stroke 0, 0, 0
+    }
+  }
+}.show
+```
+
+![Fill Style](/screenshots/glimmer-dsl-gtk-mac-cairo-fill-style.png)
+
+### Gradient
+
+[samples/cairo/gradient.rb](/samples/cairo/gradient.rb)
+
+```ruby
+require 'glimmer-dsl-gtk'
+
+include Glimmer
+
+window {
+  title 'Gradient'
+  default_size 256, 256
+  
+  drawing_area {
+    paint 242.25, 242.25, 242.25
+        
+    # Create the Linear Pattern
+    rectangle(0, 0, 256, 256) {
+      pat = Cairo::LinearPattern.new(0.0, 0.0,  0.0, 256.0)
+      pat.add_color_stop_rgba(1, 0, 0, 0, 1)
+      pat.add_color_stop_rgba(0, 1, 1, 1, 1)
+      
+      fill pat
+    }
+    
+    # Create the radial pattern
+    arc(128.0, 128.0, 76.8, 0, 2 * Math::PI) {
+      pat = Cairo::RadialPattern.new(115.2, 102.4, 25.6,
+                                         102.4,  102.4, 128.0)
+      pat.add_color_stop_rgba(0, 1, 1, 1, 1)
+      pat.add_color_stop_rgba(1, 0, 0, 0, 1)
+      
+      fill pat
+    }
+  }
+}.show
+```
+
+![Gradient](/screenshots/glimmer-dsl-gtk-mac-cairo-gradient.png)
+
+### Image
+
+[samples/cairo/image.rb](/samples/cairo/image.rb)
+
+```ruby
+require 'glimmer-dsl-gtk'
+
+include Glimmer
+
+window {
+  title 'Image'
+  default_size 256, 256
+  
+  drawing_area {
+    paint 242.25, 242.25, 242.25
+        
+    image = Cairo::ImageSurface.from_png(File.expand_path(File.join('..', '..', 'images', 'breaking-blue-wave.png'), __dir__))
+    w = image.width
+    h = image.height
+    
+    translate 128.0, 128.0
+    rotate 45*Math::PI/180
+    scale 256.0/w, 256.0/h
+    translate -0.5*w, -0.5*h
+    
+    paint image, 0, 0
+  }
+}.show
+```
+
+![Image](/screenshots/glimmer-dsl-gtk-mac-cairo-image.png)
+
+### Image Gradient
+
+[samples/cairo/image_gradient.rb](/samples/cairo/image_gradient.rb)
+
+```ruby
+require 'glimmer-dsl-gtk'
+
+include Glimmer
+
+window {
+  title 'Image Gradient'
+  default_size 256, 256
+  
+  drawing_area {
+    paint 242.25, 242.25, 242.25
+    
+    image = Cairo::ImageSurface.from_png(File.expand_path(File.join('..', '..', 'images', 'breaking-blue-wave.png'), __dir__))
+    w = image.width
+    h = image.height
+    
+    # Load the image as a surface pattern
+    pattern = Cairo::SurfacePattern.new(image)
+    pattern.extend = Cairo::EXTEND_REPEAT
+    
+    # Set up the scale matrix
+    pattern.matrix = Cairo::Matrix.scale(w/256.0 * 5.0, h/256.0 * 5.0)
+    
+    rectangle(0, 0, 256, 256) {
+      translate 128.0, 128.0
+      rotate Math::PI / 4
+      scale 1/Math.sqrt(2), 1/Math.sqrt(2)
+      translate -128.0, -128.0
+        
+      fill pattern
+    }
+  }
+}.show
+```
+
+![Image Gradient](/screenshots/glimmer-dsl-gtk-mac-cairo-image-gradient.png)
+
+### Multi Segment Caps
+
+[samples/cairo/multi_segment_caps.rb](/samples/cairo/multi_segment_caps.rb)
+
+```ruby
+require 'glimmer-dsl-gtk'
+
+include Glimmer
+
+window {
+  title 'Multi Segment Caps'
+  default_size 256, 256
+  
+  drawing_area {
+    paint 242.25, 242.25, 242.25
+    
+    path {
+      move_to 50.0, 75.0
+      line_to 200.0, 75.0
+      
+      move_to 50.0, 125.0
+      line_to 200.0, 125.0
+      
+      move_to 50.0, 175.0
+      line_to 200.0, 175.0
+      
+      line_width 30
+      line_cap Cairo::LINE_CAP_ROUND
+      stroke 0, 0, 0
+    }
+  }
+}.show
+```
+
+![Multi Segment Caps](/screenshots/glimmer-dsl-gtk-mac-cairo-multi-segment-caps.png)
+
+### Rounded Rectangle
+
+[samples/cairo/rounded_rectangle.rb](/samples/cairo/rounded_rectangle.rb)
+
+```ruby
+require 'glimmer-dsl-gtk'
+
+include Glimmer
+
+window {
+  title 'Rounded Rectangle'
+  default_size 256, 256
+  
+  drawing_area {
+    paint 242.25, 242.25, 242.25
+    
+    path {
+      rounded_rectangle(25.6, 25.6, 204.8, 204.8, 20)
+    
+      fill 127.5, 127.5, 255
+      line_width 10.0
+      stroke 127.5, 0, 0, 0.5
+    }
+  }
+}.show
+```
+
+![Rounded Rectangle](/screenshots/glimmer-dsl-gtk-mac-cairo-rounded-rectangle.png)
+
+### Set line cap
+
+[samples/cairo/set_line_cap.rb](/samples/cairo/set_line_cap.rb)
+
+```ruby
+require 'glimmer-dsl-gtk'
+
+include Glimmer
+
+window {
+  title 'Set line cap'
+  default_size 256, 256
+  
+  drawing_area {
+    paint 242.25, 242.25, 242.25
+    
+    # The main code
+    path {
+      move_to 64.0, 50.0
+      line_to 64.0, 200.0
+      
+      line_cap Cairo::LINE_CAP_BUTT #  default
+      line_width 30
+      stroke 0, 0, 0
+    }
+    
+    path {
+      move_to 128.0, 50.0
+      line_to 128.0, 200.0
+      
+      line_cap Cairo::LINE_CAP_ROUND
+      line_width 30
+      stroke 0, 0, 0
+    }
+    
+    path {
+      move_to 192.0, 50.0
+      line_to 192.0, 200.0
+      
+      line_cap Cairo::LINE_CAP_SQUARE
+      line_width 30
+      stroke 0, 0, 0
+    }
+    
+    #  draw helping lines */
+    path {
+      move_to 64.0, 50.0
+      line_to 64.0, 200.0
+      move_to 128.0, 50.0
+      line_to 128.0, 200.0
+      move_to 192.0, 50.0
+      line_to 192.0, 200.0
+      
+      line_width 2.56
+      stroke 255, 51, 51
+    }
+  }
+}.show
+```
+
+![Set line cap](/screenshots/glimmer-dsl-gtk-mac-cairo-set-line-cap.png)
+
+### Set line join
+
+[samples/cairo/set_line_join.rb](/samples/cairo/set_line_join.rb)
+
+```ruby
+require 'glimmer-dsl-gtk'
+
+include Glimmer
+
+window {
+  title 'Set line join'
+  default_size 256, 256
+  
+  drawing_area {
+    paint 242.25, 242.25, 242.25
+    
+    # The main code
+    path {
+      move_to 76.8, 84.48
+      rel_line_to 51.2, -51.2
+      rel_line_to 51.2, 51.2
+      
+      line_join Cairo::LINE_JOIN_MITER # default
+      line_width 40.96
+      stroke 0, 0, 0
+    }
+    
+    path {
+      move_to 76.8, 161.28
+      rel_line_to 51.2, -51.2
+      rel_line_to 51.2, 51.2
+      
+      line_join Cairo::LINE_JOIN_BEVEL
+      line_width 40.96
+      stroke 0, 0, 0
+    }
+    
+    path {
+      move_to 76.8, 238.08
+      rel_line_to 51.2, -51.2
+      rel_line_to 51.2, 51.2
+      
+      line_join Cairo::LINE_JOIN_ROUND
+      line_width 40.96
+      stroke 0, 0, 0
+    }
+  }
+}.show
+```
+
+![Set line join](/screenshots/glimmer-dsl-gtk-mac-cairo-set-line-join.png)
+
 ## Girb (Glimmer IRB)
 
 You can run the `girb` command (`bin/girb` if you cloned the project locally):

data/VERSION

@@ -1 +1 @@
-0.0.5
+0.0.6

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

@@ -69,17 +69,46 @@ module Glimmer
           @drawing_operations = []
         end
         
+        def post_initialize_child(child)
+          child_paths << child if child.is_a?(Path)
+        end
+        
+        def child_paths
+          @child_paths ||= []
+        end
+        
         def draw_shape(drawing_area_widget, cairo_context)
+          previous_matrix = cairo_context.matrix
+          apply_transforms(cairo_context, target: :shape)
           cairo_context.new_path
           @drawing_operations.each do |drawing_operation_details|
             cairo_context.send(drawing_operation_details[0], *drawing_operation_details[1])
           end
+          child_paths.each do |child|
+            cairo_context.new_sub_path
+            child.drawing_operations.each do |drawing_operation_details|
+              cairo_context.send(drawing_operation_details[0], *drawing_operation_details[1])
+            end
+          end
+          cairo_context.set_matrix(previous_matrix)
         end
         
         def arc(*args)
           @drawing_operations << [:arc, args]
         end
       
+        def arc_negative(*args)
+          @drawing_operations << [:arc_negative, args]
+        end
+      
+        def rectangle(*args)
+          @drawing_operations << [:rectangle, args]
+        end
+      
+        def rounded_rectangle(*args)
+          @drawing_operations << [:rounded_rectangle, args]
+        end
+      
         def move_to(*args)
           @drawing_operations << [:move_to, args]
         end