glimmer-dsl-libui 0.0.22 → 0.0.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 974aa189dcfa34a3e96c581592d2acaa4fa1e14edeb784c3b80e47cf21b1f90d
-  data.tar.gz: 6bb99a56fe942706ec3a773cd90d0cfd88554fc03cb27465fb375538a56ac351
+  metadata.gz: 6e29a14b4e8c65eaaa7ffa9d1ef5a7e1d13a592cf5d1090e850525b8d9188450
+  data.tar.gz: 37f077425a3627fddd8047a052fa55c43b8b907160ddb406a821757b544c5d97
 SHA512:
-  metadata.gz: '08fcb654b14c8bf9bdca6e1d3b28477cd8d1d389447d4162dabe7f8f743cd9ee68e033012e01feadc5e9ac92daeca0feb74c794d0323ad4c083dde1f0fc90125'
-  data.tar.gz: e215a320873a70904062254fd63c32296b917c661592983d89bd6fa940413a5e554b6aa42c8e637409d777c3e739c6e80d1fef8072d1c72b4f275fc8985b775e
+  metadata.gz: 2447933bbdce2b03660b8d9c4eb13736b4989eb2632288951ad836b3bd25f0e8fa7075d976b42da1df8a2495540302dd18c02c162abb08ab5a9cd5fad4c1378d
+  data.tar.gz: f5018929934e70c3364f29ac124626ac1d9502e748e4b98ec1f44cdc5dae63e3baf7d856aa56dc50bb044e2909d040fff1c812ca66706bba4fa53fd92efdc97c

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Change Log
 
+## 0.0.23
+
+- Have `image` not require `width` and `height` if it only has one `image_part` (defaults to `image_part` `width` and `height`)
+- Upgrade to LibUI version 0.0.10
+
 ## 0.0.22
 
 - New examples/basic_table_button.rb

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.0.22
+# [<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.0.23
 ## 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)
 [![Maintainability](https://api.codeclimate.com/v1/badges/ce2853efdbecf6ebdc73/maintainability)](https://codeclimate.com/github/AndyObtiva/glimmer-dsl-libui/maintainability)
@@ -43,7 +43,7 @@ Other [Glimmer](https://rubygems.org/gems/glimmer) DSL gems you might be interes
 
 ## Table of Contents
 
-- [Glimmer DSL for LibUI 0.0.22](#-glimmer-dsl-for-libui-0022)
+- [Glimmer DSL for LibUI 0.0.23](#-glimmer-dsl-for-libui-0023)
   - [Glimmer GUI DSL Concepts](#glimmer-gui-dsl-concepts)
   - [Usage](#usage)
   - [API](#api)
@@ -162,7 +162,7 @@ gem install glimmer-dsl-libui
 Or install via Bundler `Gemfile`:
 
 ```ruby
-gem 'glimmer-dsl-libui', '~> 0.0.22'
+gem 'glimmer-dsl-libui', '~> 0.0.23'
 ```
 
 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.
@@ -319,7 +319,9 @@ Control(Args) | Properties | Listeners
 - Smart defaults for `grid` child attributes are `left` (`0`), `top` (`0`), `xspan` (`1`), `yspan` (`1`), `hexpand` (`false`), `halign` (`0`), `vexpand` (`false`), and `valign` (`0`)
 - The `table` control automatically constructs required `TableModelHandler`, `TableModel`, and `TableParams`, calculating all their arguments from `cell_rows` and `editable` properties (e.g. `NumRows`) as well as nested columns (e.g. `text_column`)
 - Table model instances are automatically freed from memory after `window` is destroyed.
+- Table `cell_rows` data has implicit data-binding to table cell values. When deleting data from `cell_rows` array, then actual rows from the `table` are automatically deleted.
 - `image` instances are automatically freed from memory after `window` is destroyed.
+- `image` `width` and `height` can be left off if it has one `image_part` only as they default to the same `width` and `height` of the `image_part`
 
 ### API Gotchas
 
@@ -2141,7 +2143,7 @@ IMAGE_ROWS = []
   data = canvas.to_rgba_stream
   width = canvas.width
   height = canvas.height
-  img = image(width, height) {
+  img = image {
     image_part(data, width, height, width * 4)
   }
   IMAGE_ROWS << [img] # array of one column cell
@@ -2219,23 +2221,19 @@ IMAGE_ROWS = []
   data = canvas.to_rgba_stream
   width = canvas.width
   height = canvas.height
-  img = image(width, 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], text, text, [img, text]]
+  IMAGE_ROWS << [[img, text], [img, text]] # cell values are dual-element arrays
 rescue StandardError => e
   warn url, e.message
 end
 
-window('The Red Turtle', 900, 350) {
+window('The Red Turtle', 670, 350) {
   horizontal_box {
     table {
       image_text_column('image/number')
-      text_column('number')
-      text_column('number (editable)') {
-        editable true
-      }
       image_text_column('image/number (editable)') {
         editable true
       }

data/VERSION

@@ -1 +1 @@
-0.0.22
+0.0.23

data/examples/basic_table_image.rb

@@ -20,7 +20,7 @@ IMAGE_ROWS = []
   data = canvas.to_rgba_stream
   width = canvas.width
   height = canvas.height
-  img = image(width, height) {
+  img = image {
     image_part(data, width, height, width * 4)
   }
   IMAGE_ROWS << [img] # array of one column cell

data/examples/basic_table_image_text.rb

@@ -20,23 +20,19 @@ IMAGE_ROWS = []
   data = canvas.to_rgba_stream
   width = canvas.width
   height = canvas.height
-  img = image(width, 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], text, text, [img, text]]
+  IMAGE_ROWS << [[img, text], [img, text]] # cell values are dual-element arrays
 rescue StandardError => e
   warn url, e.message
 end
 
-window('The Red Turtle', 900, 350) {
+window('The Red Turtle', 670, 350) {
   horizontal_box {
     table {
       image_text_column('image/number')
-      text_column('number')
-      text_column('number (editable)') {
-        editable true
-      }
       image_text_column('image/number (editable)') {
         editable true
       }

data/lib/glimmer/libui/image_part_proxy.rb

@@ -27,6 +27,16 @@ module Glimmer
     #
     # Follows the Proxy Design Pattern
     class ImagePartProxy < ControlProxy
+      def initialize(keyword, parent, args, &block)
+        @keyword = keyword
+        @parent_proxy = parent
+        @args = args
+        @block = block
+        @enabled = true
+        @children = []
+        post_add_content if @block.nil?
+      end
+      
       private
       
       def build_control

data/lib/glimmer/libui/image_proxy.rb

@@ -0,0 +1,63 @@
+# Copyright (c) 2021 Andy Maleh
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+require 'glimmer/libui/control_proxy'
+require 'glimmer/data_binding/observer'
+
+using ArrayIncludeMethods
+
+module Glimmer
+  module LibUI
+    # Proxy for LibUI image objects
+    #
+    # Follows the Proxy Design Pattern
+    class ImageProxy < ControlProxy
+      def initialize(keyword, parent, args, &block)
+        @keyword = keyword
+        @parent_proxy = parent
+        @args = args
+        @block = block
+        @enabled = true
+        @children = []
+        post_add_content if @block.nil?
+      end
+      
+      def post_add_content
+        build_control
+        super
+      end
+ 
+      def post_initialize_child(child)
+        @children << child
+      end
+      
+      private
+      
+      def build_control
+        @args = [@children.first.args[1], @children.first.args[2]] if @children.size == 1 && (@args[0].nil? || @args[1].nil?)
+        super
+        @libui.tap do
+          @children.each {|child| child&.send(:build_control) }
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-libui
 version: !ruby/object:Gem::Version
-  version: 0.0.22
+  version: 0.0.23
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-25 00:00:00.000000000 Z
+date: 2021-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glimmer
@@ -50,14 +50,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.9
+        version: 0.0.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.9
+        version: 0.0.10
 - !ruby/object:Gem::Dependency
   name: juwelier
   requirement: !ruby/object:Gem::Requirement
@@ -246,6 +246,7 @@ files:
 - lib/glimmer/libui/horizontal_box_proxy.rb
 - lib/glimmer/libui/image_column_proxy.rb
 - lib/glimmer/libui/image_part_proxy.rb
+- lib/glimmer/libui/image_proxy.rb
 - lib/glimmer/libui/image_text_column_proxy.rb
 - lib/glimmer/libui/label_proxy.rb
 - lib/glimmer/libui/menu_item_proxy.rb