glimmer-dsl-libui 0.2.22 → 0.3.1

data/VERSION

@@ -1 +1 @@
-0.2.22
+0.3.1

data/examples/area_gallery.rb

@@ -49,7 +49,7 @@ window('Area Gallery', 400, 400) {
     }
     text(161, 40, 100) { # x, y, width
       string('Area Gallery') {
-        font family: 'Arial', size: 14
+        font family: 'Arial', size: (OS.mac? ? 14 : 11)
         color :black
       }
     }

data/examples/area_gallery2.rb

@@ -149,7 +149,7 @@ window('Area Gallery', 400, 400) {
       width 100
       
       string {
-        font family: 'Arial', size: 14
+        font family: 'Arial', size: (OS.mac? ? 14 : 11)
         color :black
         
         'Area Gallery'

data/examples/area_gallery3.rb

@@ -50,7 +50,7 @@ window('Area Gallery', 400, 400) {
       }
       text(161, 40, 100) { # x, y, width
         string('Area Gallery') {
-          font family: 'Arial', size: 14
+          font family: 'Arial', size: (OS.mac? ? 14 : 11)
           color :black
         }
       }

data/examples/area_gallery4.rb

@@ -150,7 +150,7 @@ window('Area Gallery', 400, 400) {
         width 100
         
         string {
-          font family: 'Arial', size: 14
+          font family: 'Arial', size: (OS.mac? ? 14 : 11)
           color :black
           
           'Area Gallery'

data/examples/basic_image.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require 'glimmer-dsl-libui'
+
+include Glimmer
+
+window('Basic Image', 96, 96) {
+  area {
+    # image is not a real LibUI control. It is built in Glimmer as a custom control that renders
+    # tiny pixels/lines as rectangle paths. As such, it does not have good performance, but can
+    # be used in exceptional circumstances where an image control is really needed.
+    #
+    # Furthermore, adding image directly under area is even slower due to taking up more memory for every
+    # image pixel rendered. Check basic_image2.rb for a faster alternative using on_draw manually.
+    #
+    # It is recommended to pass width/height args to shrink image and achieve faster performance.
+    image(File.expand_path('../icons/glimmer.png', __dir__), 96, 96)
+  }
+}.show

data/examples/basic_image2.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+require 'glimmer-dsl-libui'
+
+include Glimmer
+
+window('Basic Image', 96, 96) {
+  area {
+    on_draw do |area_draw_params|
+      image(File.expand_path('../icons/glimmer.png', __dir__), 96, 96)
+    end
+  }
+}.show

data/examples/basic_image3.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require 'glimmer-dsl-libui'
+
+include Glimmer
+
+window('Basic Image', 96, 96) {
+  area {
+    # image is not a real LibUI control. It is built in Glimmer as a custom control that renders
+    # tiny pixels/lines as rectangle paths. As such, it does not have good performance, but can
+    # be used in exceptional circumstances where an image control is really needed.
+    #
+    # Furthermore, adding image directly under area is even slower due to taking up more memory for every
+    # image pixel rendered. Check basic_image4.rb for a faster alternative using on_draw manually.
+    #
+    # It is recommended to pass width/height args to shrink image and achieve faster performance.
+    image {
+      file File.expand_path('../icons/glimmer.png', __dir__)
+      width 96
+      height 96
+    }
+  }
+}.show

data/examples/basic_image4.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require 'glimmer-dsl-libui'
+
+include Glimmer
+
+window('Basic Image', 96, 96) {
+  area {
+    on_draw do |area_draw_params|
+      image {
+        file File.expand_path('../icons/glimmer.png', __dir__)
+        width 96
+        height 96
+      }
+    end
+  }
+}.show

data/examples/basic_image5.rb

@@ -0,0 +1,75 @@
+# frozen_string_literal: true
+
+# This is the manual way of rendering an image unto an area control.
+# It could come in handy in special situations.
+# Otherwise, it is recommended to simply utilize the `image` control that
+# can be nested under area or area on_draw listener to automate all this work.
+
+require 'glimmer-dsl-libui'
+require 'chunky_png'
+
+include Glimmer
+
+puts 'Parsing image...'; $stdout.flush
+
+f = File.open(File.expand_path('../icons/glimmer.png', __dir__))
+canvas = ChunkyPNG::Canvas.from_io(f)
+f.close
+canvas.resample_nearest_neighbor!(96, 96)
+data = canvas.to_rgba_stream
+width = canvas.width
+height = canvas.height
+puts "Image width: #{width}"
+puts "Image height: #{height}"
+
+puts 'Parsing colors...'; $stdout.flush
+
+color_maps = height.times.map do |y|
+  width.times.map do |x|
+    r = data[(y*width + x)*4].ord
+    g = data[(y*width + x)*4 + 1].ord
+    b = data[(y*width + x)*4 + 2].ord
+    a = data[(y*width + x)*4 + 3].ord
+    {x: x, y: y, color: {r: r, g: g, b: b, a: a}}
+  end
+end.flatten
+puts "#{color_maps.size} pixels to render..."; $stdout.flush
+
+puts 'Parsing shapes...'; $stdout.flush
+
+shape_maps = []
+original_color_maps = color_maps.dup
+indexed_original_color_maps = Hash[original_color_maps.each_with_index.to_a]
+color_maps.each do |color_map|
+  index = indexed_original_color_maps[color_map]
+  @rectangle_start_x ||= color_map[:x]
+  @rectangle_width ||= 1
+  if color_map[:x] < width - 1 && color_map[:color] == original_color_maps[index + 1][:color]
+    @rectangle_width += 1
+  else
+    if color_map[:x] > 0 && color_map[:color] == original_color_maps[index - 1][:color]
+      shape_maps << {x: @rectangle_start_x, y: color_map[:y], width: @rectangle_width, height: 1, color: color_map[:color]}
+    else
+      shape_maps << {x: color_map[:x], y: color_map[:y], width: 1, height: 1, color: color_map[:color]}
+    end
+    @rectangle_width = 1
+    @rectangle_start_x = color_map[:x] == width - 1 ? 0 : color_map[:x] + 1
+  end
+end
+puts "#{shape_maps.size} shapes to render..."; $stdout.flush
+
+puts 'Rendering image...'; $stdout.flush
+
+window('Basic Image', 96, 96) {
+  area {
+    on_draw do |area_draw_params|
+      shape_maps.each do |shape_map|
+        path {
+          rectangle(shape_map[:x], shape_map[:y], shape_map[:width], shape_map[:height])
+
+          fill shape_map[:color]
+        }
+      end
+    end
+  }
+}.show

data/examples/basic_table_color.rb

@@ -1,20 +1,10 @@
 # frozen_string_literal: true
 
 require 'glimmer-dsl-libui'
-require 'chunky_png'
 
 include Glimmer
 
-f = File.open(File.expand_path('../icons/glimmer.png', __dir__))
-canvas = ChunkyPNG::Canvas.from_io(f)
-f.close
-canvas.resample_nearest_neighbor!(24, 24)
-data = canvas.to_rgba_stream
-width = canvas.width
-height = canvas.height
-img = image {
-  image_part(data, width, height, width * 4)
-}
+img = image(File.expand_path('../icons/glimmer.png', __dir__), 24, 24)
 
 data = [
   [['cat', :red]      , ['meow', :blue]                  , [true, 'mammal', :green], [img, 'Glimmer', :dark_blue], {r: 255, g: 120, b: 0, a: 0.5}],

data/examples/basic_table_color2.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+require 'glimmer-dsl-libui'
+require 'chunky_png'
+
+include Glimmer
+
+f = File.open(File.expand_path('../icons/glimmer.png', __dir__))
+canvas = ChunkyPNG::Canvas.from_io(f)
+f.close
+canvas.resample_nearest_neighbor!(24, 24)
+data = canvas.to_rgba_stream
+width = canvas.width
+height = canvas.height
+img = image {
+  image_part(data, width, height, width * 4)
+}
+
+data = [
+  [['cat', :red]      , ['meow', :blue]                  , [true, 'mammal', :green], [img, 'Glimmer', :dark_blue], {r: 255, g: 120, b: 0, a: 0.5}],
+  [['dog', :yellow]   , ['woof', {r: 240, g: 32, b: 32}] , [true, 'mammal', :green], [img, 'Glimmer', :dark_blue], :skyblue],
+  [['chicken', :beige], ['cock-a-doodle-doo', :blue]     , [false, 'mammal', :red] , [img, 'Glimmer', :beige], {r: 5, g: 120, b: 110}],
+  [['horse', :purple] , ['neigh', {r: 240, g: 32, b: 32}], [true, 'mammal', :green], [img, 'Glimmer', :dark_blue], '13a1fb'],
+  [['cow', :gray]     , ['moo', :blue]                   , [true, 'mammal', :green], [img, 'Glimmer', :brown], 0x12ff02]
+]
+
+window('Animals', 500, 200) {
+  horizontal_box {
+    table {
+      text_color_column('Animal')
+      text_color_column('Sound')
+      checkbox_text_color_column('Description')
+      image_text_color_column('GUI')
+      background_color_column('Mammal')
+
+      cell_rows data
+    }
+  }
+}.show

data/examples/basic_table_image.rb

@@ -4,8 +4,6 @@
 # This example displays images that can be freely downloaded from the Studio Ghibli website.
 
 require 'glimmer-dsl-libui'
-require 'chunky_png'
-require 'open-uri'
 
 include Glimmer
 
@@ -13,18 +11,8 @@ IMAGE_ROWS = []
 
 50.times do |i|
   url = format('https://www.ghibli.jp/gallery/thumb-redturtle%03d.png', (i + 1))
-  puts "Processing Image: #{url}"
-  $stdout.flush # for Windows
-  f = URI.open(url)
-  canvas = ChunkyPNG::Canvas.from_io(f)
-  f.close
-  data = canvas.to_rgba_stream
-  width = canvas.width
-  height = canvas.height
-  img = image {
-    image_part(data, width, height, width * 4)
-  }
-  IMAGE_ROWS << [img] # array of one column cell
+  puts "Processing Image: #{url}"; $stdout.flush # for Windows
+  IMAGE_ROWS << [image(url)] # array of one column cell
 rescue StandardError => e
   warn url, e.message
 end

data/examples/basic_table_image2.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+# NOTE:
+# This example displays images that can be freely downloaded from the Studio Ghibli website.
+
+require 'glimmer-dsl-libui'
+require 'chunky_png'
+require 'open-uri'
+
+include Glimmer
+
+IMAGE_ROWS = []
+
+50.times do |i|
+  url = format('https://www.ghibli.jp/gallery/thumb-redturtle%03d.png', (i + 1))
+  puts "Processing Image: #{url}"
+  $stdout.flush # for Windows
+  f = URI.open(url)
+  canvas = ChunkyPNG::Canvas.from_io(f)
+  f.close
+  data = canvas.to_rgba_stream
+  width = canvas.width
+  height = canvas.height
+  img = image {
+    image_part(data, width, height, width * 4)
+  }
+  IMAGE_ROWS << [img] # array of one column cell
+rescue StandardError => e
+  warn url, e.message
+end
+
+window('The Red Turtle', 310, 350, false) {
+  horizontal_box {
+    table {
+      image_column('www.ghibli.jp/works/red-turtle')
+      
+      cell_rows IMAGE_ROWS
+    }
+  }
+  
+  on_closing do
+    puts 'Bye Bye'
+  end
+}.show

data/examples/basic_table_image_text.rb

@@ -4,8 +4,6 @@
 # This example displays images that can be freely downloaded from the Studio Ghibli website.
 
 require 'glimmer-dsl-libui'
-require 'chunky_png'
-require 'open-uri'
 
 include Glimmer
 
@@ -13,18 +11,9 @@ IMAGE_ROWS = []
 
 5.times do |i|
   url = format('https://www.ghibli.jp/gallery/thumb-redturtle%03d.png', (i + 1))
-  puts "Processing Image: #{url}"
-  $stdout.flush # for Windows
-  f = URI.open(url)
-  canvas = ChunkyPNG::Canvas.from_io(f)
-  f.close
-  data = canvas.to_rgba_stream
-  width = canvas.width
-  height = canvas.height
-  img = image {
-    image_part(data, width, height, width * 4)
-  }
+  puts "Processing Image: #{url}"; $stdout.flush # for Windows
   text = url.sub('https://www.ghibli.jp/gallery/thumb-redturtle', '').sub('.png', '')
+  img = image(url)
   IMAGE_ROWS << [[img, text], [img, text]] # cell values are dual-element arrays
 rescue StandardError => e
   warn url, e.message

data/examples/basic_table_image_text2.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+# NOTE:
+# This example displays images that can be freely downloaded from the Studio Ghibli website.
+
+require 'glimmer-dsl-libui'
+require 'chunky_png'
+require 'open-uri'
+
+include Glimmer
+
+IMAGE_ROWS = []
+
+5.times do |i|
+  url = format('https://www.ghibli.jp/gallery/thumb-redturtle%03d.png', (i + 1))
+  puts "Processing Image: #{url}"
+  $stdout.flush # for Windows
+  f = URI.open(url)
+  canvas = ChunkyPNG::Canvas.from_io(f)
+  f.close
+  data = canvas.to_rgba_stream
+  width = canvas.width
+  height = canvas.height
+  img = image {
+    image_part(data, width, height, width * 4)
+  }
+  text = url.sub('https://www.ghibli.jp/gallery/thumb-redturtle', '').sub('.png', '')
+  IMAGE_ROWS << [[img, text], [img, text]] # cell values are dual-element arrays
+rescue StandardError => e
+  warn url, e.message
+end
+
+window('The Red Turtle', 670, 350) {
+  horizontal_box {
+    table {
+      image_text_column('image/number')
+      image_text_column('image/number (editable)') {
+        editable true
+      }
+      
+      cell_rows IMAGE_ROWS
+    }
+  }
+}.show

data/examples/snake/model/game.rb

@@ -13,7 +13,6 @@ class Snake
       attr_reader :width, :height
       attr_accessor :snake, :apple, :over, :score, :high_score
       alias over? over
-      # TODO implement scoring on snake eating apples
       
       def initialize(width = WIDTH_DEFAULT, height = HEIGHT_DEFAULT)
         @width = width

data/examples/tetris.rb

@@ -153,6 +153,8 @@ class Tetris
         end
       }
       radio_menu_item('Rotate Left on Up Arrow') {
+        checked true
+
         on_clicked do
           @game.rotate_left_on_up = true
         end
@@ -235,7 +237,19 @@ class Tetris
       on_key_down do |key_event|
         case key_event
         in ext_key: :down
-          @game.down!
+          if OS.windows?
+            # rate limit downs in Windows as they go too fast when key is held
+            @queued_downs ||= 0
+            if @queued_downs < 2
+              @queued_downs += 1
+              Glimmer::LibUI.timer(0.01, repeat: false) do
+                @game.down! if @queued_downs < 2
+                @queued_downs -= 1
+              end
+            end
+          else
+            @game.down!
+          end
         in key: ' '
           @game.down!(instant: true)
         in ext_key: :up
@@ -319,8 +333,11 @@ class Tetris
   end
   
   def start_moving_tetrominos_down
-    Glimmer::LibUI.timer(@game.delay) do
-      @game.down! if !@game.game_over? && !@game.paused?
+    unless @tetrominos_start_moving_down
+      @tetrominos_start_moving_down = true
+      Glimmer::LibUI.timer(@game.delay) do
+        @game.down! if !@game.game_over? && !@game.paused?
+      end
     end
   end
   
@@ -333,6 +350,8 @@ class Tetris
   
   def show_high_scores
     Glimmer::LibUI.queue_main do
+      game_paused = !!@game.paused
+      @game.paused = true
       if @game.high_scores.empty?
         high_scores_string = "No games have been scored yet."
       else
@@ -341,6 +360,7 @@ class Tetris
         end.join("\n")
       end
       msg_box('High Scores', high_scores_string)
+      @game.paused = game_paused
     end
   end
   

data/examples/tic_tac_toe.rb

@@ -52,7 +52,7 @@ class TicTacToe
                 }
                 text(23, 19) {
                   @cells[row] << string('') {
-                    font family: 'Arial', size: 20
+                    font family: 'Arial', size: OS.mac? ? 20 : 16
                   }
                 }
                 on_mouse_up do

data/lib/glimmer/dsl/libui/control_expression.rb

@@ -40,7 +40,7 @@ module Glimmer
         
         def add_content(parent, keyword, *args, &block)
           super
-          parent.post_add_content
+          parent&.post_add_content
         end
       end
     end

data/lib/glimmer/libui/control_proxy/area_proxy.rb

@@ -218,6 +218,7 @@ module Glimmer
           {
             key: key_to_char(area_key_event.Key, modifiers),
             key_value: area_key_event.Key,
+            key_code: area_key_event.Key,
             ext_key: ext_key_to_symbol(area_key_event.ExtKey),
             ext_key_value: area_key_event.ExtKey,
             modifier: modifiers_to_symbols(area_key_event.Modifier).first,

data/lib/glimmer/libui/control_proxy/column.rb

@@ -43,9 +43,9 @@ module Glimmer
           @column_index ||= @parent_proxy.send(:next_column_index)
         end
         
-        # actual index within table columns (disregarding nil fillings that account for DualColumn instances)
+        # actual index within table columns (disregarding extra fillings that account for DualColumn instances)
         def index
-          @parent_proxy.columns.compact.index(self)
+          @parent_proxy.columns.select {|c| c.is_a?(Column)}.index(self)
         end
       end
     end

data/lib/glimmer/libui/control_proxy/image_part_proxy.rb

@@ -34,7 +34,6 @@ module Glimmer
           @args = args
           @block = block
           @enabled = true
-          @children = []
           post_add_content if @block.nil?
         end