glimmer-dsl-libui 0.2.19 → 0.2.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0ff67ac5c365f692b3bd884c0b0cfaacfe0fcecc9eb26b18ade0cd8f52c78c06
-  data.tar.gz: 705fda986670a9e196c0f520d9322058f0cbdbb83b7317e3ca55eb34937aff0c
+  metadata.gz: 70f45c14b2e19345bb8ca1a16409260ef9835daf69053febcc6e28309a58618d
+  data.tar.gz: 06e4d212588dff9195b6cc6df82bcca4f6c1fcc1f401abc5d174ef88aa20164a
 SHA512:
-  metadata.gz: c4ed363d60a4998baba5e3d6fdba60fde484e6d77d997051c3a7c9fdd5ab852ee5f9ee96de35d74f631b09a7bbb375adda967c915aee4f896facfc40375ef6da
-  data.tar.gz: 9c8d0080d025effa2e074cc140f532d6a9f5e3a1726dc1230a8dc7519316d1fbc6d947edee39ab3cbc8889cef10a221089b89b6f70fbbb8c76872a34332565ce
+  metadata.gz: 18a072c532d014a9849e96c6add0a7279200384c11478c99c2271e6f34cd30c2035d751f4644e8eb1f78f847497d1be0126c795efc32582ce22727c0b71ab029
+  data.tar.gz: efe76c9b3c7439eb27b2b8c1159a5d133966b8282b130c983544bf60b1df41134267dbdc59a3b08e94d6491dffbe9e0a9d54a9afcad89701f68e3c17fbd6bcc4

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Change Log
 
+## 0.2.20
+
+- Improve examples/tetris.rb with menus, high score dialog, and options
+- Prevent examples/tetris.rb `window` from being resized
+- Support `window` `resizable` property (`resizable false` means one cannot resize `window`)
+- Support calling `window.content_size = [x, y]` as an alternative to `window.set_content_size(x, y)`
+- Fix issue with hooking `on_content_size_changed` listener to `window`
+- Fix issue with using `window` `content_size` property getter
+
 ## 0.2.19
 
 - Improve examples/tetris.rb with a score board (indicating next Tetromino, score, level, and lines)

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 LibUI 0.2.19
+# [<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 LibUI 0.2.20
 ## Prerequisite-Free Ruby Desktop Development GUI Library
 [![Gem Version](https://badge.fury.io/rb/glimmer-dsl-libui.svg)](http://badge.fury.io/rb/glimmer-dsl-libui)
 [![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)
@@ -370,7 +370,7 @@ gem install glimmer-dsl-libui
 Or install via Bundler `Gemfile`:
 
 ```ruby
-gem 'glimmer-dsl-libui', '~> 0.2.19'
+gem 'glimmer-dsl-libui', '~> 0.2.20'
 ```
 
 Add `require 'glimmer-dsl-libui'` at the top, and then `include Glimmer` into the top-level main object for testing or into an actual class for serious usage.
@@ -456,6 +456,7 @@ Keyword(Args) | Properties | Listeners
 `checkbox_column(name as String)` | `editable` (Boolean) | None
 `checkbox_text_column(name as String)` | `editable` (Boolean), `editable_checkbox` (Boolean), `editable_text` (Boolean) | None
 `checkbox_text_color_column(name as String)` | `editable` (Boolean), `editable_checkbox` (Boolean), `editable_text` (Boolean) | None
+`check_menu_item(text as String)` | `checked` (Boolean) | `on_clicked`
 `combobox` | `items` (`Array` of `String`), `selected` (`Integer`) | `on_selected`
 `color_button` | `color` (Array of `red` as `Float`, `green` as `Float`, `blue` as `Float`, `alpha` as `Float`), `red` as `Float`, `green` as `Float`, `blue` as `Float`, `alpha` as `Float` | `on_changed`
 `date_picker` | `time` (`Hash` of keys: `sec` as `Integer`, `min` as `Integer`, `hour` as `Integer`, `mday` as `Integer`, `mon` as `Integer`, `year` as `Integer`, `wday` as `Integer`, `yday` as `Integer`, `dst` as Boolean) | `on_changed`
@@ -478,7 +479,7 @@ Keyword(Args) | Properties | Listeners
 `line(x as Numeric, y as Numeric)` | `x` (`Numeric`), `y` (`Numeric`) | None
 `matrix(m11 = nil as Numeric, m12 = nil as Numeric, m21 = nil as Numeric, m22 = nil as Numeric, m31 = nil as Numeric, m32 = nil as Numeric)` | `m11` (`Numeric`), `m12` (`Numeric`), `m21` (`Numeric`), `m22` (`Numeric`), `m31` (`Numeric`), `m32` (`Numeric`) | None
 `menu(text as String)` | None | None
-`menu_item(text as String)` | `checked` (Boolean) | `on_clicked`
+`menu_item(text as String)` | None | `on_clicked`
 `message_box` (alias for `msg_box`; see for arguments) | None | None
 `message_box_error` (alias for `msg_box_error`; see for arguments) | None | None
 `multiline_entry` | `read_only` (Boolean), `text` (`String`) | `on_changed`
@@ -497,6 +498,7 @@ Keyword(Args) | Properties | Listeners
 `radio_buttons` | `selected` (`Integer`) | `on_selected`
 `rectangle(x as Numeric, y as Numeric, width as Numeric, height as Numeric)` |  `x` (`Numeric`), `y` (`Numeric`), `width` (`Numeric`), `height` (`Numeric`) | None
 `search_entry` | `read_only` (Boolean), `text` (`String`) | `on_changed`
+`separator_menu_item` | None | None
 `slider(min as Numeric, max as Numeric)` | `value` (`Numeric`) | `on_changed`
 `spinbox(min as Numeric, max as Numeric)` | `value` (`Numeric`) | `on_changed`
 `square(x as Numeric, y as Numeric, length as Numeric)` | `x` (`Numeric`), `y` (`Numeric`), `length` (`Numeric`) | None
@@ -510,7 +512,7 @@ Keyword(Args) | Properties | Listeners
 `time_picker` | `time` (`Hash` of keys: `sec` as `Integer`, `min` as `Integer`, `hour` as `Integer`) | `on_changed`
 `vertical_box` | `padded` (Boolean) | None
 `vertical_separator` | None | None
-`window(title as String, width as Integer, height as Integer, has_menubar as Boolean)` | `borderless` (Boolean), `content_size` (width `Numeric`, height `Numeric`), `fullscreen` (Boolean), `margined` (Boolean), `title` (`String`) | `on_closing`, `on_content_size_changed`, `on_destroy`
+`window(title as String, width as Integer, height as Integer, has_menubar as Boolean)` | `borderless` (Boolean), `content_size` (width `Numeric`, height `Numeric`), `fullscreen` (Boolean), `margined` (Boolean), `title` (`String`), `resizable` (Boolean) | `on_closing`, `on_content_size_changed`, `on_destroy`
 
 ### Common Control Properties
 - `enabled` (Boolean)
@@ -6234,6 +6236,8 @@ window('Method-Based Custom Keyword') {
 
 ### Tetris
 
+Glimmer Tetris utilizes many small areas to represent Tetromino blocks because this ensures smaller redraws per tetromino block color change, thus higher performance than having one area that gets redrawn on every little change.
+
 [examples/tetris.rb](examples/tetris.rb)
 
 Run with this command from the root of the project if you cloned the project:
@@ -6254,6 +6258,8 @@ Mac
 
 ![glimmer-dsl-libui-mac-tetris-game-over.png](images/glimmer-dsl-libui-mac-tetris-game-over.png)
 
+![glimmer-dsl-libui-mac-tetris-high-scores.png](images/glimmer-dsl-libui-mac-tetris-high-scores.png)
+
 New [Glimmer DSL for LibUI](https://rubygems.org/gems/glimmer-dsl-libui) Version:
 
 ```ruby
@@ -6268,8 +6274,6 @@ class Tetris
   BEVEL_CONSTANT = 20
   COLOR_GRAY = {r: 192, g: 192, b: 192}
     
-  attr_reader :game
-  
   def initialize
     @game = Model::Game.new
   end
@@ -6282,8 +6286,11 @@ class Tetris
   end
   
   def create_gui
+    menu_bar
+    
     @main_window = window('Glimmer Tetris') {
       content_size Model::Game::PLAYFIELD_WIDTH * BLOCK_SIZE, Model::Game::PLAYFIELD_HEIGHT * BLOCK_SIZE + 98
+      resizable false
       
       vertical_box {
         label { # filler
@@ -6302,8 +6309,10 @@ class Tetris
   def register_observers
     Glimmer::DataBinding::Observer.proc do |game_over|
       if game_over
+        @pause_menu_item.enabled = false
         show_game_over_dialog
       else
+        @pause_menu_item.enabled = true
         start_moving_tetrominos_down
       end
     end.observe(@game, :game_over)
@@ -6361,6 +6370,76 @@ class Tetris
     end.observe(@game, :level)
   end
   
+  def menu_bar
+    menu('Game') {
+      @pause_menu_item = check_menu_item('Pause') {
+        enabled false
+        
+        on_clicked do
+          @game.paused = @pause_menu_item.checked?
+        end
+      }
+      menu_item('Restart') {
+        on_clicked do
+          @game.restart!
+        end
+      }
+      separator_menu_item
+      menu_item('Exit') {
+        on_clicked do
+          exit(0)
+        end
+      }
+      quit_menu_item if OS.mac?
+    }
+    
+    menu('View') {
+      menu_item('Show High Scores') {
+        on_clicked do
+          show_high_scores
+        end
+      }
+      menu_item('Clear High Scores') {
+        on_clicked {
+          @game.clear_high_scores!
+        }
+      }
+    }
+
+    menu('Options') {
+      radio_menu_item('Instant Down on Up Arrow') {
+        on_clicked do
+          @game.instant_down_on_up = true
+        end
+      }
+      radio_menu_item('Rotate Right on Up Arrow') {
+        on_clicked do
+          @game.rotate_right_on_up = true
+        end
+      }
+      radio_menu_item('Rotate Left on Up Arrow') {
+        on_clicked do
+          @game.rotate_left_on_up = true
+        end
+      }
+    }
+
+    menu('Help') {
+      if OS.mac?
+        about_menu_item {
+          on_clicked do
+            show_about_dialog
+          end
+        }
+      end
+      menu_item('About') {
+        on_clicked do
+          show_about_dialog
+        end
+      }
+    }
+  end
+  
   def playfield(playfield_width: , playfield_height: , block_size: , &extra_content)
     blocks = []
     vertical_box {
@@ -6421,26 +6500,26 @@ class Tetris
       on_key_down do |key_event|
         case key_event
         in ext_key: :down
-          game.down!
+          @game.down!
         in key: ' '
-          game.down!(instant: true)
+          @game.down!(instant: true)
         in ext_key: :up
-          case game.up_arrow_action
+          case @game.up_arrow_action
           when :instant_down
-            game.down!(instant: true)
+            @game.down!(instant: true)
           when :rotate_right
-            game.rotate!(:right)
+            @game.rotate!(:right)
           when :rotate_left
-            game.rotate!(:left)
+            @game.rotate!(:left)
           end
         in ext_key: :left
-          game.left!
+          @game.left!
         in ext_key: :right
-          game.right!
+          @game.right!
         in modifier: :shift
-          game.rotate!(:right)
+          @game.rotate!(:right)
         in modifier: :control
-          game.rotate!(:left)
+          @game.rotate!(:left)
         else
           # Do Nothing
         end
@@ -6512,10 +6591,29 @@ class Tetris
   
   def show_game_over_dialog
     Glimmer::LibUI.queue_main do
-      msg_box('Game Over', "Score: #{@game.high_scores.first.score}\nLines: #{@game.high_scores.first.lines}\nLevel: #{@game.high_scores.first.level}")
+      msg_box('Game Over!', "Score: #{@game.high_scores.first.score}\nLines: #{@game.high_scores.first.lines}\nLevel: #{@game.high_scores.first.level}")
       @game.restart!
     end
   end
+  
+  def show_high_scores
+    Glimmer::LibUI.queue_main do
+      if @game.high_scores.empty?
+        high_scores_string = "No games have been scored yet."
+      else
+        high_scores_string = @game.high_scores.map do |high_score|
+          "#{high_score.name} | Score: #{high_score.score} | Lines: #{high_score.lines} | Level: #{high_score.level}"
+        end.join("\n")
+      end
+      msg_box('High Scores', high_scores_string)
+    end
+  end
+  
+  def show_about_dialog
+    Glimmer::LibUI.queue_main do
+      msg_box('About', 'Glimmer Tetris - Glimmer DSL for LibUI Example - Copyright (c) 2021 Andy Maleh')
+    end
+  end
 end
 
 Tetris.new.launch

data/VERSION

@@ -1 +1 @@
-0.2.19
+0.2.20

data/examples/tetris/model/game.rb

@@ -85,11 +85,13 @@ class Tetris
       
       def clear_high_scores!
         high_scores.clear
+        save_high_scores!
       end
       
       def add_high_score!
         self.added_high_score = true
         high_scores.prepend(PastGame.new("Player #{high_scores.count + 1}", score, lines, level))
+        save_high_scores!
       end
       
       def save_high_scores!

data/examples/tetris.rb

@@ -9,8 +9,6 @@ class Tetris
   BEVEL_CONSTANT = 20
   COLOR_GRAY = {r: 192, g: 192, b: 192}
     
-  attr_reader :game
-  
   def initialize
     @game = Model::Game.new
   end
@@ -23,8 +21,11 @@ class Tetris
   end
   
   def create_gui
+    menu_bar
+    
     @main_window = window('Glimmer Tetris') {
       content_size Model::Game::PLAYFIELD_WIDTH * BLOCK_SIZE, Model::Game::PLAYFIELD_HEIGHT * BLOCK_SIZE + 98
+      resizable false
       
       vertical_box {
         label { # filler
@@ -43,8 +44,10 @@ class Tetris
   def register_observers
     Glimmer::DataBinding::Observer.proc do |game_over|
       if game_over
+        @pause_menu_item.enabled = false
         show_game_over_dialog
       else
+        @pause_menu_item.enabled = true
         start_moving_tetrominos_down
       end
     end.observe(@game, :game_over)
@@ -102,6 +105,76 @@ class Tetris
     end.observe(@game, :level)
   end
   
+  def menu_bar
+    menu('Game') {
+      @pause_menu_item = check_menu_item('Pause') {
+        enabled false
+        
+        on_clicked do
+          @game.paused = @pause_menu_item.checked?
+        end
+      }
+      menu_item('Restart') {
+        on_clicked do
+          @game.restart!
+        end
+      }
+      separator_menu_item
+      menu_item('Exit') {
+        on_clicked do
+          exit(0)
+        end
+      }
+      quit_menu_item if OS.mac?
+    }
+    
+    menu('View') {
+      menu_item('Show High Scores') {
+        on_clicked do
+          show_high_scores
+        end
+      }
+      menu_item('Clear High Scores') {
+        on_clicked {
+          @game.clear_high_scores!
+        }
+      }
+    }
+
+    menu('Options') {
+      radio_menu_item('Instant Down on Up Arrow') {
+        on_clicked do
+          @game.instant_down_on_up = true
+        end
+      }
+      radio_menu_item('Rotate Right on Up Arrow') {
+        on_clicked do
+          @game.rotate_right_on_up = true
+        end
+      }
+      radio_menu_item('Rotate Left on Up Arrow') {
+        on_clicked do
+          @game.rotate_left_on_up = true
+        end
+      }
+    }
+
+    menu('Help') {
+      if OS.mac?
+        about_menu_item {
+          on_clicked do
+            show_about_dialog
+          end
+        }
+      end
+      menu_item('About') {
+        on_clicked do
+          show_about_dialog
+        end
+      }
+    }
+  end
+  
   def playfield(playfield_width: , playfield_height: , block_size: , &extra_content)
     blocks = []
     vertical_box {
@@ -162,26 +235,26 @@ class Tetris
       on_key_down do |key_event|
         case key_event
         in ext_key: :down
-          game.down!
+          @game.down!
         in key: ' '
-          game.down!(instant: true)
+          @game.down!(instant: true)
         in ext_key: :up
-          case game.up_arrow_action
+          case @game.up_arrow_action
           when :instant_down
-            game.down!(instant: true)
+            @game.down!(instant: true)
           when :rotate_right
-            game.rotate!(:right)
+            @game.rotate!(:right)
           when :rotate_left
-            game.rotate!(:left)
+            @game.rotate!(:left)
           end
         in ext_key: :left
-          game.left!
+          @game.left!
         in ext_key: :right
-          game.right!
+          @game.right!
         in modifier: :shift
-          game.rotate!(:right)
+          @game.rotate!(:right)
         in modifier: :control
-          game.rotate!(:left)
+          @game.rotate!(:left)
         else
           # Do Nothing
         end
@@ -253,10 +326,29 @@ class Tetris
   
   def show_game_over_dialog
     Glimmer::LibUI.queue_main do
-      msg_box('Game Over', "Score: #{@game.high_scores.first.score}\nLines: #{@game.high_scores.first.lines}\nLevel: #{@game.high_scores.first.level}")
+      msg_box('Game Over!', "Score: #{@game.high_scores.first.score}\nLines: #{@game.high_scores.first.lines}\nLevel: #{@game.high_scores.first.level}")
       @game.restart!
     end
   end
+  
+  def show_high_scores
+    Glimmer::LibUI.queue_main do
+      if @game.high_scores.empty?
+        high_scores_string = "No games have been scored yet."
+      else
+        high_scores_string = @game.high_scores.map do |high_score|
+          "#{high_score.name} | Score: #{high_score.score} | Lines: #{high_score.lines} | Level: #{high_score.level}"
+        end.join("\n")
+      end
+      msg_box('High Scores', high_scores_string)
+    end
+  end
+  
+  def show_about_dialog
+    Glimmer::LibUI.queue_main do
+      msg_box('About', 'Glimmer Tetris - Glimmer DSL for LibUI Example - Copyright (c) 2021 Andy Maleh')
+    end
+  end
 end
 
 Tetris.new.launch

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

@@ -78,6 +78,7 @@ module Glimmer
           when 'on_destroy'
             on_destroy(&listener)
           else
+            default_behavior_listener = nil
             if listener_name == 'on_closing'
               default_behavior_listener = Proc.new do
                 return_value = listener.call(self)
@@ -90,9 +91,45 @@ module Glimmer
                 end
               end
             end
-            super(listener_name, &default_behavior_listener)
+            super(listener_name, &(default_behavior_listener || listener))
           end
         end
+        
+        def content_size(*args)
+          if args.empty?
+            width = Fiddle::Pointer.malloc(8)
+            height = Fiddle::Pointer.malloc(8)
+            ::LibUI.window_content_size(@libui, width, height)
+            width = width[0, 8].unpack1('i')
+            height = height[0, 8].unpack1('i')
+            [width, height]
+          else
+            args = args.first if args.size == 1 && args.first.is_a?(Array)
+            super
+            @width = args[0]
+            @height = args[1]
+          end
+        end
+        alias content_size= content_size
+        alias set_content_size content_size
+        
+        def resizable(value = nil)
+          if value.nil?
+            @resizable = true if @resizable.nil?
+            @resizable
+          else
+            @resizable = value
+            if !@resizable && !@resizable_listener_registered
+              handle_listener('on_content_size_changed') do
+                set_content_size(@width, @height) unless @resizable
+              end
+              @resizable_listener_registered = true
+            end
+          end
+        end
+        alias resizable? resizable
+        alias resizable= resizable
+        alias set_resizable resizable
       
         private
         
@@ -107,6 +144,8 @@ module Glimmer
           construction_args[2] = DEFAULT_HEIGHT if construction_args.size == 2
           construction_args[3] = DEFAULT_HAS_MENUBAR if construction_args.size == 3
           construction_args[3] = Glimmer::LibUI.boolean_to_integer(construction_args[3]) if construction_args.size == 4 && (construction_args[3].is_a?(TrueClass) || construction_args[3].is_a?(FalseClass))
+          @width = construction_args[1]
+          @height = construction_args[2]
           @libui = ControlProxy.new_control(@keyword, construction_args)
           @libui.tap do
             handle_listener('on_closing') do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-libui
 version: !ruby/object:Gem::Version
-  version: 0.2.19
+  version: 0.2.20
 platform: ruby
 authors:
 - Andy Maleh