glimmer-dsl-libui 0.4.13 → 0.4.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e1f51ecb1e42d70d4081b671b3ba4ee277a35cc5f75372536a826802f2766124
-  data.tar.gz: 949069cd28522b6480ae3095cd4056aaeb26c90758429a393a5ee325a5e29c4c
+  metadata.gz: d51961908ec1315a42fe183bc79cbe86bc8d86e2dea9ac9a35d2dfaefaf3912d
+  data.tar.gz: af6c03eb6d451816d32242c7f7d99ce3ed28755f363f3620faea2a590c3e0ea8
 SHA512:
-  metadata.gz: 9f0f791fe044894e4aa300f9642b2703e1774e0bb02bb98044056306e6e06ae32d58296301c0e6b6c0ede7bd2236ce2c2793ee56beb5e9f7db2ea772e427811d
-  data.tar.gz: 8d11e1478a7c6a317a1a176cf464faaff5947231f01635c69d9771baf643ef80afba40ae92fdff551959f81f17eab2effa6edfe7dc40085ee020c789e1baf586
+  metadata.gz: cb828f87dfbc9c56fd15123ecb29a3c499f22c315ef6582d47c629353e444f16c2b0755b958abe8d77f0506ee25c1cffbafa0a682ea2bfb1e9d649fa49cb7e9f
+  data.tar.gz: ff5f76d4c7868c28d223a95bff04a5a3b9cf01879eec9231a709afd2e67a6ce6bb2a4df8a8ccf41406a1cf69aaf7250a40c7c726952f8e8b8cc280b0e8e77175

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Change Log
 
+## 0.4.14
+
+- Support passing width or height alone to `image` keyword, calculating the other dimension automatically while preserving original aspect ratio
+- Support passing x and y coordinates to `image` keyword as 2nd and 3rd arguments of 5 arguments (file, x, y, width, height)
+- Support passing x, y, width, height to `image` keyword as options kwargs
+
 ## 0.4.13
 
 - Shorten height of examples/cpu_percentage.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.4.13
+# [<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.4.14
 ## 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)
@@ -180,7 +180,7 @@ class FormTable
           text_column('State')
     
           editable true
-          cell_rows <=> [self, :contacts] # explicit data-binding to Model Array
+          cell_rows <=> [self, :contacts] # explicit data-binding to self.contacts Modal Array, auto-inferring model attribute names from underscored table column names by convention
           
           on_changed do |row, type, row_data|
             puts "Row #{row} #{type}: #{row_data}"
@@ -500,7 +500,7 @@ gem install glimmer-dsl-libui
 Or install via Bundler `Gemfile`:
 
 ```ruby
-gem 'glimmer-dsl-libui', '~> 0.4.13'
+gem 'glimmer-dsl-libui', '~> 0.4.14'
 ```
 
 Test that installation worked by running the [Meta-Example](#examples):
@@ -1027,7 +1027,8 @@ Given that it is very new and is not a [libui](https://github.com/andlabs/libui)
 - It only supports the `.png` file format.
 - [libui](https://github.com/andlabs/libui) pixel-by-pixel rendering performance is slow.
 - Including an `image` inside an `area` `on_draw` listener improves performance due to not retaining pixel/line data in memory.
-- Supplying `width` and `height` (2nd and 3rd arguments) greatly improves performance when shrinking image.
+- Supplying `width` and `height` options greatly improves performance when shrinking image (e.g. `image('somefile.png', width: 24, height: 24)`). You can also supply one of the two dimensions, and the other one gets calculated automatically while preserving original aspect ratio (e.g. `image('somefile.png', height: 24)`)
+- [Glimmer DSL for LibUI](https://rubygems.org/gems/glimmer-dsl-libui) lets you optionally specify `x` and `y` in addition to `file`, `width` and `height` (5 arguments total) to offset image location.
 
 Currently, it is recommended to use `image` with very small `width` and `height` values only (e.g. 24x24).
 
@@ -1046,7 +1047,11 @@ include Glimmer
 
 window('Basic Image', 96, 96) {
   area {
-    image(File.expand_path('icons/glimmer.png', __dir__), 96, 96)
+    image(File.expand_path('icons/glimmer.png', __dir__), height: 96) # width is automatically calculated from height while preserving original aspect ratio
+#     image(File.expand_path('icons/glimmer.png', __dir__), width: 96, height: 96) # you can specify both width and height options
+#     image(File.expand_path('icons/glimmer.png', __dir__), 96, 96) # you can specify width, height as args
+#     image(File.expand_path('../icons/glimmer.png', __dir__), 0, 0, 96, 96) # you can specify x, y, width, height args as alternative
+#     image(File.expand_path('../icons/glimmer.png', __dir__), x: 0, y: 0, width: 96, height: 96) # you can specify x, y, width, height options as alternative
   }
 }.show
 ```
@@ -1078,6 +1083,8 @@ window('Basic Image', 96, 96) {
   area {
     image {
       file File.expand_path('icons/glimmer.png', __dir__)
+#       x 0 # default
+#       y 0 # default
       width 96
       height 96
     }
@@ -1623,7 +1630,7 @@ class SomeTable
         text_column('City')
         text_column('State')
   
-        cell_rows <=> [self, :contacts] # explicit data-binding to Model Array auto-inferring model attribute names from underscored table column names by convention
+        cell_rows <=> [self, :contacts] # explicit data-binding to self.contacts Model Array, auto-inferring model attribute names from underscored table column names by convention
       }
     }.show
   end
@@ -4098,7 +4105,11 @@ window('Basic Image', 96, 96) {
     # 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)
+    image(File.expand_path('../icons/glimmer.png', __dir__), height: 96) # width is automatically calculated from height while preserving original aspect ratio
+#     image(File.expand_path('../icons/glimmer.png', __dir__), width: 96, height: 96) # you can specify both width, height options as alternative
+#     image(File.expand_path('../icons/glimmer.png', __dir__), 96, 96) # you can specify width, height args as alternative
+#     image(File.expand_path('../icons/glimmer.png', __dir__), 0, 0, 96, 96) # you can specify x, y, width, height args as alternative
+#     image(File.expand_path('../icons/glimmer.png', __dir__), x: 0, y: 0, width: 96, height: 96) # you can specify x, y, width, height options as alternative
   }
 }.show
 ```
@@ -4106,8 +4117,6 @@ window('Basic Image', 96, 96) {
 New [Glimmer DSL for LibUI](https://rubygems.org/gems/glimmer-dsl-libui) Version 2 (better performance via `on_draw`):
 
 ```ruby
-# frozen_string_literal: true
-
 require 'glimmer-dsl-libui'
 
 include Glimmer
@@ -4115,7 +4124,7 @@ include Glimmer
 window('Basic Image', 96, 96) {
   area {
     on_draw do |area_draw_params|
-      image(File.expand_path('../icons/glimmer.png', __dir__), 96, 96)
+      image(File.expand_path('../icons/glimmer.png', __dir__), height: 96)
     end
   }
 }.show
@@ -4124,8 +4133,6 @@ window('Basic Image', 96, 96) {
 New [Glimmer DSL for LibUI](https://rubygems.org/gems/glimmer-dsl-libui) Version 3 (explicit properties):
 
 ```ruby
-# frozen_string_literal: true
-
 require 'glimmer-dsl-libui'
 
 include Glimmer
@@ -4142,7 +4149,9 @@ window('Basic Image', 96, 96) {
     # 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
+#       x 0 # default
+#       y 0 # default
+#       width 96 # gets calculated from height while preserving original aspect ratio of 512x512
       height 96
     }
   }
@@ -4152,8 +4161,6 @@ window('Basic Image', 96, 96) {
 New [Glimmer DSL for LibUI](https://rubygems.org/gems/glimmer-dsl-libui) Version 4 (better performance with `on_draw` when setting explicit properties):
 
 ```ruby
-# frozen_string_literal: true
-
 require 'glimmer-dsl-libui'
 
 include Glimmer
@@ -4163,7 +4170,6 @@ window('Basic Image', 96, 96) {
     on_draw do |area_draw_params|
       image {
         file File.expand_path('../icons/glimmer.png', __dir__)
-        width 96
         height 96
       }
     end
@@ -6896,7 +6902,7 @@ class FormTable
           text_column('State')
     
           editable true
-          cell_rows <=> [self, :contacts] # explicit data-binding to Model Array auto-inferring model attribute names from underscored table column names by convention
+          cell_rows <=> [self, :contacts] # explicit data-binding to self.contacts Model Array, auto-inferring model attribute names from underscored table column names by convention
           
           on_changed do |row, type, row_data|
             puts "Row #{row} #{type}: #{row_data}"

data/VERSION

@@ -1 +1 @@
-0.4.13
+0.4.14

data/examples/basic_image.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require 'glimmer-dsl-libui'
 
 include Glimmer
@@ -14,6 +12,10 @@ window('Basic Image', 96, 96) {
     # 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)
+    image(File.expand_path('../icons/glimmer.png', __dir__), height: 96) # width is automatically calculated from height while preserving original aspect ratio
+#     image(File.expand_path('../icons/glimmer.png', __dir__), width: 96, height: 96) # you can specify both width, height options as alternative
+#     image(File.expand_path('../icons/glimmer.png', __dir__), 96, 96) # you can specify width, height args as alternative
+#     image(File.expand_path('../icons/glimmer.png', __dir__), 0, 0, 96, 96) # you can specify x, y, width, height args as alternative
+#     image(File.expand_path('../icons/glimmer.png', __dir__), x: 0, y: 0, width: 96, height: 96) # you can specify x, y, width, height options as alternative
   }
 }.show

data/examples/basic_image2.rb

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

data/examples/basic_image3.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require 'glimmer-dsl-libui'
 
 include Glimmer
@@ -16,7 +14,9 @@ window('Basic Image', 96, 96) {
     # 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
+#       x 0 # default
+#       y 0 # default
+#       width 96 # gets calculated from height while preserving original aspect ratio of 512x512
       height 96
     }
   }

data/examples/basic_image4.rb

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

data/examples/basic_image5.rb

@@ -1,5 +1,3 @@
-# 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

data/examples/form_table.rb

@@ -98,7 +98,7 @@ class FormTable
           text_column('State')
     
           editable true
-          cell_rows <=> [self, :contacts] # explicit data-binding to Model Array
+          cell_rows <=> [self, :contacts] # explicit data-binding to self.contacts Model Array, auto-inferring model attribute names from underscored table column names by convention
           
           on_changed do |row, type, row_data|
             puts "Row #{row} #{type}: #{row_data}"

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

@@ -53,11 +53,12 @@ module Glimmer
         include Parent
         prepend Transformable
         
-        attr_reader :data, :pixels, :shapes
+        attr_reader :data, :pixels, :shapes, :options
         
         def initialize(keyword, parent, args, &block)
           @keyword = keyword
           @parent_proxy = parent
+          @options = args.last.is_a?(Hash) ? args.pop : {}
           @args = args
           @block = block
           @enabled = true
@@ -92,11 +93,47 @@ module Glimmer
         alias file= file
         alias set_file file
       
+        def x(value = nil)
+          if value.nil?
+            @args.size > 3 ? @args[1] : (@options[:x] || 0)
+          else
+            if @args.size > 3
+              @args[1] = value
+            else
+              @options[:x] = value
+            end
+            if area_image? && @content_added
+              post_add_content
+              request_auto_redraw
+            end
+          end
+        end
+        alias x= x
+        alias set_x x
+      
+        def y(value = nil)
+          if value.nil?
+            @args.size > 3 ? @args[2] : (@options[:y] || 0)
+          else
+            if @args.size > 3
+              @args[2] = value
+            else
+              @options[:y] = value
+            end
+            if area_image? && @content_added
+              post_add_content
+              request_auto_redraw
+            end
+          end
+        end
+        alias y= y
+        alias set_y y
+        
         def width(value = nil)
           if value.nil?
-            @args[1]
+            @args.size > 3 ? @args[3] : (@options[:width] || @args[1])
           else
-            @args[1] = value
+            set_width_variable(value)
             if area_image? && @content_added
               post_add_content
               request_auto_redraw
@@ -108,9 +145,9 @@ module Glimmer
       
         def height(value = nil)
           if value.nil?
-            @args[2]
+            @args.size > 3 ? @args[4] : (@options[:height] || @args[2])
           else
-            @args[2] = value
+            set_height_variable(value)
             if area_image? && @content_added
               post_add_content
               request_auto_redraw
@@ -148,6 +185,26 @@ module Glimmer
         
         private
         
+        def set_width_variable(value)
+          if @args.size > 3
+            @args[3] = value
+          elsif @options[:width]
+            @options[:width] = value
+          else
+            @args[1] = value
+          end
+        end
+        
+        def set_height_variable(value)
+          if @args.size > 3
+            @args[4] = value
+          elsif @options[:height]
+            @options[:height] = value
+          else
+            @args[2] = value
+          end
+        end
+        
         def build_control
           unless area_image? # image object
             if file
@@ -180,10 +237,15 @@ module Glimmer
             canvas = ChunkyPNG::Canvas.from_io(f)
             f.close
           end
-          canvas.resample_nearest_neighbor!(width, height) if width && height
+          original_width = canvas.width
+          original_height = canvas.height
+          require 'bigdecimal'
+          calculated_width = ((BigDecimal(height)/BigDecimal(original_height))*original_width).to_i if height && !width
+          calculated_height = ((BigDecimal(width)/BigDecimal(original_width))*original_height).to_i if width && !height
+          canvas.resample_nearest_neighbor!(calculated_width || width, calculated_height || height) if width || height
           @data = canvas.to_rgba_stream
-          @args[1] = canvas.width
-          @args[2] = canvas.height
+          set_width_variable(canvas.width) unless width
+          set_height_variable(canvas.height) unless height
           [@data, width, height]
         end
         
@@ -203,6 +265,8 @@ module Glimmer
           @shapes = []
           original_pixels = @pixels.dup
           indexed_original_pixels = Hash[original_pixels.each_with_index.to_a]
+          x_offset = x
+          y_offset = y
           @pixels.each do |pixel|
             index = indexed_original_pixels[pixel]
             @rectangle_start_x ||= pixel[:x]
@@ -211,9 +275,9 @@ module Glimmer
               @rectangle_width += 1
             else
               if pixel[:x] > 0 && pixel[:color] == original_pixels[index - 1][:color]
-                @shapes << {x: @rectangle_start_x, y: pixel[:y], width: @rectangle_width, height: 1, color: pixel[:color]}
+                @shapes << {x: x_offset + @rectangle_start_x, y: y_offset + pixel[:y], width: @rectangle_width, height: 1, color: pixel[:color]}
               else
-                @shapes << {x: pixel[:x], y: pixel[:y], width: 1, height: 1, color: pixel[:color]}
+                @shapes << {x: x_offset + pixel[:x], y: y_offset + pixel[:y], width: 1, height: 1, color: pixel[:color]}
               end
               @rectangle_width = 1
               @rectangle_start_x = pixel[:x] == width - 1 ? 0 : pixel[:x] + 1

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-libui
 version: !ruby/object:Gem::Version
-  version: 0.4.13
+  version: 0.4.14
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-03 00:00:00.000000000 Z
+date: 2021-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glimmer