glimmer-dsl-gtk 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 908b538188d1ca4fd8c7b96bcc1a890febf29a55d2f37d09a81fa1849b15e7fa
-  data.tar.gz: c88057203f02fed224707cf1ee12f5b66f71d6b9b4632986f0ac3b7f973fd59c
+  metadata.gz: 13f25c4ca569b9dd667c4d87e2e175d9c953f9e613ab572cffda63f8cb181fb1
+  data.tar.gz: 4b28c418c1957467b0eaa9de2dbbd03cf9e63542a3e3d6425c6d101c04f90c09
 SHA512:
-  metadata.gz: ec820ca1c3782e2b7311bf917bf97f2369da65fff6cf110f887a60e164775ad2b41df9f25a9c904beffd67f3ebd9b6e7decd57f6a222f1a24a5725c5f396d8c1
-  data.tar.gz: 759f1b973090ed6df0ef78daee7a4220b0261090b300a4a9164fcda5a3779d3a831048fa25d9936848903e639358d5942fec4694e6174bb950f908b7abaeec0b
+  metadata.gz: 62541e82fbb67f300bee346c685942a24c98a93662830021d75b4c4fe6b4e0eba0ca4ad048f745f54b051d52e990d9d3220c551d47cb33f163d9c3c9812d3bce
+  data.tar.gz: 7a0af395ce5e7ed8da206052341dc98ef7a4eb0d967413bdb9deb21f15647a07713fea1b0fca1296acc6bff46d96251ff2a9fb0a9962f34383328f36e041560a

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Change Log
 
+## 0.0.4
+
+- Tetris Menu Bar
+- Tetris Score Board
+- Tetris Next Tetromino Preview
+
 ## 0.0.3
 
 - samples/elaborate/tetris.rb (basic Tetris implementation)

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.3
+# [<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.4
 ## 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)
@@ -61,6 +61,7 @@ sudo apt install -y -V libgirepository1.0-dev
 On the Mac, make sure to:
 - Have [Homebrew](https://brew.sh/) installed
 - Run this [Homebrew](https://brew.sh/) command to have GTK display GUI icons: `brew install adwaita-icon-theme`
+- (Optional) You can upgrade your GTK3/GTK4/GTK+ by running: `brew install gtk+3` / `brew install gtk+4` / `brew install gtk+`
 
 ### Windows
 
@@ -79,7 +80,7 @@ gem install glimmer-dsl-gtk
 
 Add the following to `Gemfile`:
 ```
-gem 'glimmer-dsl-gtk', '~> 0.0.3'
+gem 'glimmer-dsl-gtk', '~> 0.0.4'
 ```
 
 And, then run:
@@ -842,7 +843,14 @@ class Tetris
       default_size Model::Game::PLAYFIELD_WIDTH * BLOCK_SIZE, Model::Game::PLAYFIELD_HEIGHT * BLOCK_SIZE # + 98
       
       box(:vertical) {
-        @playfield_blocks = playfield(playfield_width: @game.playfield_width, playfield_height: @game.playfield_height, block_size: BLOCK_SIZE)
+        tetris_menu_bar
+
+        box(:horizontal) {
+          @playfield_blocks = playfield(playfield_width: @game.playfield_width, playfield_height: @game.playfield_height, block_size: BLOCK_SIZE)
+          
+          score_board
+        }
+        
       }
       
       on(:key_press_event) do |widget, key_event|
@@ -900,6 +908,135 @@ class Tetris
         end
       end
     end
+    
+    Model::Game::PREVIEW_PLAYFIELD_HEIGHT.times do |row|
+      Model::Game::PREVIEW_PLAYFIELD_WIDTH.times do |column|
+        observe(@game.preview_playfield[row][column], :color) do |new_color|
+          color = new_color
+          block = @preview_playfield_blocks[row][column]
+          block[:background_square].fill = color
+          block[:top_bevel_edge].fill = [color[0] + 4*BEVEL_CONSTANT, color[1] + 4*BEVEL_CONSTANT, color[2] + 4*BEVEL_CONSTANT]
+          block[:right_bevel_edge].fill = [color[0] - BEVEL_CONSTANT, color[1] - BEVEL_CONSTANT, color[2] - BEVEL_CONSTANT]
+          block[:bottom_bevel_edge].fill = [color[0] - BEVEL_CONSTANT, color[1] - BEVEL_CONSTANT, color[2] - BEVEL_CONSTANT]
+          block[:left_bevel_edge].fill = [color[0] - BEVEL_CONSTANT, color[1] - BEVEL_CONSTANT, color[2] - BEVEL_CONSTANT]
+          block[:border_square].stroke = new_color == Model::Block::COLOR_CLEAR ? COLOR_GRAY : color
+          block[:drawing_area].queue_draw
+        end
+      end
+    end
+    
+    observe(@game, :score) do |new_score|
+      @score_label.text = new_score.to_s
+    end
+
+    observe(@game, :lines) do |new_lines|
+      @lines_label.text = new_lines.to_s
+    end
+
+    observe(@game, :level) do |new_level|
+      @level_label.text = new_level.to_s
+    end
+  end
+  
+  def tetris_menu_bar
+    menu_bar {
+      menu_item(label: 'Game') { |mi|
+        m = menu {
+          check_menu_item(label: 'Pause') {
+            on(:activate) do
+              @game.paused = !@game.paused?
+            end
+          }
+          
+          menu_item(label: 'Restart') {
+            on(:activate) do
+              @game.restart!
+            end
+          }
+          
+          separator_menu_item
+          
+          menu_item(label: 'Exit') {
+            on(:activate) do
+              @main_window.close
+            end
+          }
+        }
+        mi.submenu = m.gtk
+      }
+      
+      menu_item(label: 'View') { |mi|
+        m = menu {
+          menu_item(label: 'Show High Scores') {
+            on(:activate) do
+              show_high_score_dialog
+            end
+          }
+          
+          menu_item(label: 'Clear High Scores') {
+            on(:activate) do
+              @game.clear_high_scores!
+            end
+          }
+        }
+        mi.submenu = m.gtk
+      }
+      
+      menu_item(label: 'Options') { |mi|
+        m = menu {
+          rmi = radio_menu_item(nil, 'Instant Down on Up') {
+            on(:activate) do
+              @game.instant_down_on_up!
+            end
+          }
+          
+          default_rmi = radio_menu_item(rmi.group, 'Rotate Right on Up') {
+            on(:activate) do
+              @game.rotate_right_on_up!
+            end
+          }
+          default_rmi.activate
+          
+          radio_menu_item(rmi.group, 'Rotate Left on Up') {
+            on(:activate) do
+              @game.rotate_left_on_up!
+            end
+          }
+        }
+        mi.submenu = m.gtk
+      }
+      
+      menu_item(label: 'Options') { |mi|
+        m = menu {
+          menu_item(label: 'About') {
+            on(:activate) do
+              show_about_dialog
+            end
+          }
+        }
+        mi.submenu = m.gtk
+      }
+    }
+  end
+  
+  def score_board
+    box(:vertical) {
+      label
+      @preview_playfield_blocks = playfield(playfield_width: Model::Game::PREVIEW_PLAYFIELD_WIDTH, playfield_height: Model::Game::PREVIEW_PLAYFIELD_HEIGHT, block_size: BLOCK_SIZE)
+      
+      label
+      label('Score')
+      @score_label = label
+
+      label
+      label('Lines')
+      @lines_label = label
+
+      label
+      label('Level')
+      @level_label = label
+      label
+    }
   end
   
   def playfield(playfield_width: , playfield_height: , block_size: , &extra_content)
@@ -978,6 +1115,41 @@ class Tetris
     @game.restart!
     false
   end
+  
+  def show_high_score_dialog
+    game_paused = !!@game.paused
+    @game.paused = true
+    
+    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
+    
+    message_dialog(@main_window) { |md|
+      title 'High Scores'
+      text high_scores_string
+      
+      on(:response) do
+        md.destroy
+      end
+    }.show
+    
+    @game.paused = game_paused
+  end
+  
+  def show_about_dialog
+    message_dialog(@main_window) { |md|
+      title 'About'
+      text "Glimmer Tetris\n\nGlimmer DSL for GTK\n\nElaborate Sample\n\nCopyright (c) 2021-2022 Andy Maleh"
+      
+      on(:response) do
+        md.destroy
+      end
+    }.show
+  end
 end
 
 Tetris.new.launch

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/lib/glimmer/gtk/widget_proxy.rb

@@ -147,8 +147,8 @@ module Glimmer
       
       # Subclasses may override to perform post initialization work on an added child (normally must also call super)
       def post_initialize_child(child)
-        @gtk.add(child.gtk)
-        child.gtk.show
+        @gtk.add(child.gtk) if @gtk.respond_to?(:add)
+        child.gtk&.show if child.gtk&.respond_to?(:show)
       end
       
       def window_proxy

data/samples/elaborate/tetris/model/game.rb

@@ -215,6 +215,10 @@ class Tetris
         self.up_arrow_action == :instant_down
       end
       
+      def instant_down_on_up!
+        self.up_arrow_action = :instant_down
+      end
+      
       def rotate_right_on_up=(value)
         self.up_arrow_action = :rotate_right if value
       end
@@ -223,6 +227,10 @@ class Tetris
         self.up_arrow_action == :rotate_right
       end
       
+      def rotate_right_on_up!
+        self.up_arrow_action = :rotate_right
+      end
+      
       def rotate_left_on_up=(value)
         self.up_arrow_action = :rotate_left if value
       end
@@ -231,6 +239,10 @@ class Tetris
         self.up_arrow_action == :rotate_left
       end
       
+      def rotate_left_on_up!
+        self.up_arrow_action = :rotate_left
+      end
+      
       def reset_tetrominoes
         @tetrominoes = []
       end

data/samples/elaborate/tetris.rb

@@ -26,7 +26,14 @@ class Tetris
       default_size Model::Game::PLAYFIELD_WIDTH * BLOCK_SIZE, Model::Game::PLAYFIELD_HEIGHT * BLOCK_SIZE # + 98
       
       box(:vertical) {
-        @playfield_blocks = playfield(playfield_width: @game.playfield_width, playfield_height: @game.playfield_height, block_size: BLOCK_SIZE)
+        tetris_menu_bar
+
+        box(:horizontal) {
+          @playfield_blocks = playfield(playfield_width: @game.playfield_width, playfield_height: @game.playfield_height, block_size: BLOCK_SIZE)
+          
+          score_board
+        }
+        
       }
       
       on(:key_press_event) do |widget, key_event|
@@ -84,6 +91,135 @@ class Tetris
         end
       end
     end
+    
+    Model::Game::PREVIEW_PLAYFIELD_HEIGHT.times do |row|
+      Model::Game::PREVIEW_PLAYFIELD_WIDTH.times do |column|
+        observe(@game.preview_playfield[row][column], :color) do |new_color|
+          color = new_color
+          block = @preview_playfield_blocks[row][column]
+          block[:background_square].fill = color
+          block[:top_bevel_edge].fill = [color[0] + 4*BEVEL_CONSTANT, color[1] + 4*BEVEL_CONSTANT, color[2] + 4*BEVEL_CONSTANT]
+          block[:right_bevel_edge].fill = [color[0] - BEVEL_CONSTANT, color[1] - BEVEL_CONSTANT, color[2] - BEVEL_CONSTANT]
+          block[:bottom_bevel_edge].fill = [color[0] - BEVEL_CONSTANT, color[1] - BEVEL_CONSTANT, color[2] - BEVEL_CONSTANT]
+          block[:left_bevel_edge].fill = [color[0] - BEVEL_CONSTANT, color[1] - BEVEL_CONSTANT, color[2] - BEVEL_CONSTANT]
+          block[:border_square].stroke = new_color == Model::Block::COLOR_CLEAR ? COLOR_GRAY : color
+          block[:drawing_area].queue_draw
+        end
+      end
+    end
+    
+    observe(@game, :score) do |new_score|
+      @score_label.text = new_score.to_s
+    end
+
+    observe(@game, :lines) do |new_lines|
+      @lines_label.text = new_lines.to_s
+    end
+
+    observe(@game, :level) do |new_level|
+      @level_label.text = new_level.to_s
+    end
+  end
+  
+  def tetris_menu_bar
+    menu_bar {
+      menu_item(label: 'Game') { |mi|
+        m = menu {
+          check_menu_item(label: 'Pause') {
+            on(:activate) do
+              @game.paused = !@game.paused?
+            end
+          }
+          
+          menu_item(label: 'Restart') {
+            on(:activate) do
+              @game.restart!
+            end
+          }
+          
+          separator_menu_item
+          
+          menu_item(label: 'Exit') {
+            on(:activate) do
+              @main_window.close
+            end
+          }
+        }
+        mi.submenu = m.gtk
+      }
+      
+      menu_item(label: 'View') { |mi|
+        m = menu {
+          menu_item(label: 'Show High Scores') {
+            on(:activate) do
+              show_high_score_dialog
+            end
+          }
+          
+          menu_item(label: 'Clear High Scores') {
+            on(:activate) do
+              @game.clear_high_scores!
+            end
+          }
+        }
+        mi.submenu = m.gtk
+      }
+      
+      menu_item(label: 'Options') { |mi|
+        m = menu {
+          rmi = radio_menu_item(nil, 'Instant Down on Up') {
+            on(:activate) do
+              @game.instant_down_on_up!
+            end
+          }
+          
+          default_rmi = radio_menu_item(rmi.group, 'Rotate Right on Up') {
+            on(:activate) do
+              @game.rotate_right_on_up!
+            end
+          }
+          default_rmi.activate
+          
+          radio_menu_item(rmi.group, 'Rotate Left on Up') {
+            on(:activate) do
+              @game.rotate_left_on_up!
+            end
+          }
+        }
+        mi.submenu = m.gtk
+      }
+      
+      menu_item(label: 'Options') { |mi|
+        m = menu {
+          menu_item(label: 'About') {
+            on(:activate) do
+              show_about_dialog
+            end
+          }
+        }
+        mi.submenu = m.gtk
+      }
+    }
+  end
+  
+  def score_board
+    box(:vertical) {
+      label
+      @preview_playfield_blocks = playfield(playfield_width: Model::Game::PREVIEW_PLAYFIELD_WIDTH, playfield_height: Model::Game::PREVIEW_PLAYFIELD_HEIGHT, block_size: BLOCK_SIZE)
+      
+      label
+      label('Score')
+      @score_label = label
+
+      label
+      label('Lines')
+      @lines_label = label
+
+      label
+      label('Level')
+      @level_label = label
+      label
+    }
   end
   
   def playfield(playfield_width: , playfield_height: , block_size: , &extra_content)
@@ -162,6 +298,41 @@ class Tetris
     @game.restart!
     false
   end
+  
+  def show_high_score_dialog
+    game_paused = !!@game.paused
+    @game.paused = true
+    
+    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
+    
+    message_dialog(@main_window) { |md|
+      title 'High Scores'
+      text high_scores_string
+      
+      on(:response) do
+        md.destroy
+      end
+    }.show
+    
+    @game.paused = game_paused
+  end
+  
+  def show_about_dialog
+    message_dialog(@main_window) { |md|
+      title 'About'
+      text "Glimmer Tetris\n\nGlimmer DSL for GTK\n\nElaborate Sample\n\nCopyright (c) 2021-2022 Andy Maleh"
+      
+      on(:response) do
+        md.destroy
+      end
+    }.show
+  end
 end
 
 Tetris.new.launch

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-gtk
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-27 00:00:00.000000000 Z
+date: 2022-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glimmer