glimmer-dsl-libui 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e2d658816439f96cc50c56c93adb7a41798defb44470f47101d65d64fc09bb0d
-  data.tar.gz: 37abc1ee1f738d73110b9de2e5e9648c0f20d1a81fc928101b6f4d8bf5ca8e85
+  metadata.gz: 7033d9033941a3dac53c927ae7ddfdd27127eb4286a936d36e86acb226e57f99
+  data.tar.gz: e88c6c0fd4dd246e4f4f7d9f38cc3c8d10f31e0c3cbbd329de4bdd70b4618cf0
 SHA512:
-  metadata.gz: c7cbb8b5b0a37fef0d7ac89e4ddc7a18a73d9be0d82dbc58d801cc4a4bc1504dd60f803c8268083eb96fc52c2e807cbd300689a3744c9f43c7b5f1f15c778902
-  data.tar.gz: 63cfe0c72200e81b196e5cc4fa47473239bc2919db52c027abc5f62ea8de48573a793174d6d61fd2852cc2e19bbb0a5466f0fb6a881af7075bb1e8307c364384
+  metadata.gz: 97140fa3ac706b51f054a047d310172c7469eadca3b90307ff8174443c7f9655a6369e59e6f0ce68c52e7dc1189e5c53abd6654b89e0d5b52f2eed638f347d32
+  data.tar.gz: 24687499c2bd93b4514d6e7d472e57a788d50315b944bc7289a871b7286b91e46e43fd7651b28b0f1ac4a074f80efdae385a1f3b6d3cdbeaab2cbf46cc0f4c30

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 # Change Log
 
+## 0.2.3
+
+- Update examples/midi_player.rb to read sounds locally from gem
+- Support examples/basic_draw_text.rb
+- Support dynamic `text` control to be called in `area` `on_draw` listener
+- Support `text` control `default_font` property
+- Support `string` control nestable under `text` to represent an attributed/unattributed string (depending on nestable properties)
+- Support `string` control property `color`
+- Support enum symbols for `align` property of `text` control
+- Support enum symbols for `:italic` font descriptor key (in addition to numbers)
+- Support enum symbols for `:stretch` font descriptor key (in addition to numbers)
+- Support enum symbols for `:weight` font descriptor key (in addition to numbers)
+
 ## 0.2.2
 
 - Automatically add `vertical_box` parent to `area` if it did not have a box parent (otherwise, it seems not to show up on Linux, even when directly under `grid`)

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.2
+# [<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.3
 ## 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)
@@ -197,7 +197,7 @@ Other [Glimmer](https://rubygems.org/gems/glimmer) DSL gems you might be interes
 
 ## Table of Contents
 
-- [Glimmer DSL for LibUI 0.2.2](#-glimmer-dsl-for-libui-022)
+- [Glimmer DSL for LibUI 0.2.3](#-glimmer-dsl-for-libui-023)
   - [Glimmer GUI DSL Concepts](#glimmer-gui-dsl-concepts)
   - [Usage](#usage)
   - [Girb (Glimmer IRB)](#girb-glimmer-irb)
@@ -244,6 +244,7 @@ Other [Glimmer](https://rubygems.org/gems/glimmer) DSL gems you might be interes
     - [Login](#login)
     - [Timer](#timer)
     - [Color The Circles](#color-the-circles)
+    - [Basic Draw Text](#basic-draw-text)
   - [Contributing to glimmer-dsl-libui](#contributing-to-glimmer-dsl-libui)
   - [Help](#help)
     - [Issues](#issues)
@@ -331,7 +332,7 @@ gem install glimmer-dsl-libui
 Or install via Bundler `Gemfile`:
 
 ```ruby
-gem 'glimmer-dsl-libui', '~> 0.2.2'
+gem 'glimmer-dsl-libui', '~> 0.2.3'
 ```
 
 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.
@@ -1276,9 +1277,7 @@ window('Notepad', 500, 300) {
 
 ### Midi Player
 
-This example has prerequisites:
-- Install [TiMidity](http://timidity.sourceforge.net) and ensure `timidity` command is in `PATH` (can be installed via [Homebrew](https://brew.sh) on Mac or [apt-get](https://help.ubuntu.com/community/AptGet/Howto) on Linux).
-- Add `*.mid` files to `~/Music` directory (you may copy the ones included in [sounds](sounds) directory)
+To run this example, install [TiMidity](http://timidity.sourceforge.net) and ensure `timidity` command is in `PATH` (can be installed via [Homebrew](https://brew.sh) on Mac or [apt-get](https://help.ubuntu.com/community/AptGet/Howto) on Linux).
 
 [examples/midi_player.rb](examples/midi_player.rb)
 
@@ -1417,7 +1416,7 @@ class TinyMidiPlayer
 
   def initialize
     @pid = nil
-    @music_directory = File.expand_path(ARGV[0] || '~/Music/')
+    @music_directory = File.expand_path('../sounds', __dir__)
     @midi_files      = Dir.glob(File.join(@music_directory, '**/*.mid'))
                           .sort_by { |path| File.basename(path) }
     at_exit { stop_midi }
@@ -4538,6 +4537,8 @@ window('Login') {
 
 ### Timer
 
+To run this example, install [TiMidity](http://timidity.sourceforge.net) and ensure `timidity` command is in `PATH` (can be installed via [Homebrew](https://brew.sh) on Mac or [apt-get](https://help.ubuntu.com/community/AptGet/Howto) on Linux).
+
 [examples/timer.rb](examples/timer.rb)
 
 Run with this command from the root of the project if you cloned the project:
@@ -4939,6 +4940,102 @@ end
 ColorTheCircles.new.launch
 ```
 
+### Basic Draw Text
+
+[examples/basic_draw_text.rb](examples/basic_draw_text.rb)
+
+Run with this command from the root of the project if you cloned the project:
+
+```
+ruby -r './lib/glimmer-dsl-libui' examples/basic_draw_text.rb
+```
+
+Run with this command if you installed the [Ruby gem](https://rubygems.org/gems/glimmer-dsl-libui):
+
+```
+ruby -r glimmer-dsl-libui -e "require 'examples/basic_draw_text'"
+```
+
+Mac
+
+![glimmer-dsl-libui-mac-basic-draw-text.png](images/glimmer-dsl-libui-mac-basic-draw-text.png)
+
+Linux
+
+![glimmer-dsl-libui-linux-basic-draw-text.png](images/glimmer-dsl-libui-linux-basic-draw-text.png)
+
+New [Glimmer DSL for LibUI](https://rubygems.org/gems/glimmer-dsl-libui) Version:
+
+```ruby
+require 'glimmer-dsl-libui'
+
+# Michael Ende (1929-1995)
+# The Neverending Story is a fantasy novel by German writer Michael Ende,
+# The English version, translated by Ralph Manheim, was published in 1983.
+class BasicDrawText
+  include Glimmer
+  
+  def alternating_color_string(&block)
+    @index ||= 0
+    @index += 1
+    string {
+      if @index.odd?
+        color r: 0.5, g: 0, b: 0.25, a: 0.7
+      else
+        color r: 0, g: 0.5, b: 0, a: 0.7
+      end
+      
+      block.call + "\n\n"
+    }
+  end
+  
+  def launch
+    window('Michael Ende (1929-1995) The Neverending Story', 600, 400) {
+      margined true
+      
+      area {
+        on_draw do |area_draw_params|
+          text(0, 0, area_draw_params[:area_width]) {
+            align 0
+            default_font family: 'Georgia', size: 13, weight: 500, italic: 0, stretch: 4
+              
+            alternating_color_string {
+              '  At last Ygramul sensed that something was coming toward ' \
+              'her. With the speed of lightning, she turned about, confronting ' \
+              'Atreyu with an enormous steel-blue face. Her single eye had a ' \
+              'vertical pupil, which stared at Atreyu with inconceivable malignancy. '
+            }
+            alternating_color_string {
+              '  A cry of fear escaped Bastian. '
+            }
+            alternating_color_string {
+              '  A cry of terror passed through the ravine and echoed from ' \
+              'side to side. Ygramul turned her eye to left and right, to see if ' \
+              'someone else had arrived, for that sound could not have been ' \
+              'made by the boy who stood there as though paralyzed with ' \
+              'horror. '
+            }
+            alternating_color_string {
+              '  Could she have heard my cry? Bastion wondered in alarm. ' \
+              "But that's not possible. "
+            }
+            alternating_color_string {
+              '  And then Atreyu heard Ygramuls voice. It was very high ' \
+              'and slightly hoarse, not at all the right kind of voice for that ' \
+              'enormous face. Her lips did not move as she spoke. It was the ' \
+              'buzzing of a great swarm of hornets that shaped itself into ' \
+              'words. '
+            }
+          }
+        end
+      }
+    }.show
+  end
+end
+
+BasicDrawText.new.launch
+```
+
 ## Contributing to glimmer-dsl-libui
 
 -   Check out the latest master to make sure the feature hasn't been

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.3

data/examples/basic_draw_text.rb

@@ -0,0 +1,67 @@
+require 'glimmer-dsl-libui'
+
+# Michael Ende (1929-1995)
+# The Neverending Story is a fantasy novel by German writer Michael Ende,
+# The English version, translated by Ralph Manheim, was published in 1983.
+class BasicDrawText
+  include Glimmer
+  
+  def alternating_color_string(&block)
+    @index ||= 0
+    @index += 1
+    string {
+      if @index.odd?
+        color r: 0.5, g: 0, b: 0.25, a: 0.7
+      else
+        color r: 0, g: 0.5, b: 0, a: 0.7
+      end
+      
+      block.call + "\n\n"
+    }
+  end
+  
+  def launch
+    window('Michael Ende (1929-1995) The Neverending Story', 600, 400) {
+      margined true
+      
+      area {
+        on_draw do |area_draw_params|
+          text(0, 0, area_draw_params[:area_width]) {
+            align 0
+            default_font family: 'Georgia', size: 13, weight: 500, italic: 0, stretch: 4
+              
+            alternating_color_string {
+              '  At last Ygramul sensed that something was coming toward ' \
+              'her. With the speed of lightning, she turned about, confronting ' \
+              'Atreyu with an enormous steel-blue face. Her single eye had a ' \
+              'vertical pupil, which stared at Atreyu with inconceivable malignancy. '
+            }
+            alternating_color_string {
+              '  A cry of fear escaped Bastian. '
+            }
+            alternating_color_string {
+              '  A cry of terror passed through the ravine and echoed from ' \
+              'side to side. Ygramul turned her eye to left and right, to see if ' \
+              'someone else had arrived, for that sound could not have been ' \
+              'made by the boy who stood there as though paralyzed with ' \
+              'horror. '
+            }
+            alternating_color_string {
+              '  Could she have heard my cry? Bastion wondered in alarm. ' \
+              "But that's not possible. "
+            }
+            alternating_color_string {
+              '  And then Atreyu heard Ygramuls voice. It was very high ' \
+              'and slightly hoarse, not at all the right kind of voice for that ' \
+              'enormous face. Her lips did not move as she spoke. It was the ' \
+              'buzzing of a great swarm of hornets that shaped itself into ' \
+              'words. '
+            }
+          }
+        end
+      }
+    }.show
+  end
+end
+
+BasicDrawText.new.launch

data/examples/midi_player.rb

@@ -9,7 +9,7 @@ class TinyMidiPlayer
 
   def initialize
     @pid = nil
-    @music_directory = File.expand_path(ARGV[0] || '~/Music/')
+    @music_directory = File.expand_path('../sounds', __dir__)
     @midi_files      = Dir.glob(File.join(@music_directory, '**/*.mid'))
                           .sort_by { |path| File.basename(path) }
     at_exit { stop_midi }

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

@@ -40,7 +40,6 @@ module Glimmer
           super
           parent.post_add_content
         end
-        
       end
     end
   end

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

@@ -22,6 +22,7 @@
 require 'glimmer/dsl/expression'
 require 'glimmer/libui/control_proxy'
 require 'glimmer/libui/shape'
+require 'glimmer/libui/attributed_string'
 
 module Glimmer
   module DSL
@@ -30,7 +31,8 @@ module Glimmer
         def can_interpret?(parent, keyword, *args, &block)
           (
             parent.is_a?(Glimmer::LibUI::ControlProxy) or
-              parent.is_a?(Glimmer::LibUI::Shape)
+              parent.is_a?(Glimmer::LibUI::Shape) or
+              parent.is_a?(Glimmer::LibUI::AttributedString)
           ) and
             block.nil? and
             parent.respond_to?(keyword, *args)

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

@@ -0,0 +1,48 @@
+# 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/dsl/static_expression'
+require 'glimmer/dsl/parent_expression'
+require 'glimmer/libui/control_proxy/text_proxy'
+require 'glimmer/libui/attributed_string'
+
+module Glimmer
+  module DSL
+    module Libui
+      class StringExpression < StaticExpression
+        include ParentExpression
+        
+        def can_interpret?(parent, keyword, *args, &block)
+          super and
+            parent.is_a?(Glimmer::LibUI::ControlProxy::TextProxy)
+        end
+  
+        def interpret(parent, keyword, *args, &block)
+          Glimmer::LibUI::AttributedString.new(keyword, parent, args, &block)
+        end
+        
+        def add_content(parent, keyword, *args, &block)
+          parent.post_add_content
+        end
+      end
+    end
+  end
+end

data/lib/glimmer/libui/attributed_string.rb

@@ -0,0 +1,90 @@
+# 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/libui/control_proxy/area_proxy'
+require 'glimmer/libui/parent'
+require 'glimmer/libui/control_proxy/transformable'
+
+module Glimmer
+  module LibUI
+    class AttributedString
+      attr_accessor :string
+      attr_reader :block, :keyword, :parent_proxy, :args
+    
+      def initialize(keyword, parent_proxy, args, &block)
+        @keyword = keyword
+        @parent_proxy = parent_proxy
+        @args = args
+        @string = @args.first || ''
+        @block = block
+        post_add_content if @block.nil?
+      end
+      
+      def font(value = nil)
+#         UI.attributed_string_set_attribute(@parent_proxy.attributed_string, color_attribute, start, start + @string.size)
+      end
+      
+      def color(value = nil)
+        if value.nil?
+          @color
+        else
+          @color = Glimmer::LibUI.interpret_color(value)
+        end
+      end
+      
+      def background(value = nil)
+#         UI.attributed_string_set_attribute(@parent_proxy.attributed_string, color_attribute, start, start + @string.size)
+      end
+      
+      def underline(value = nil)
+#         UI.attributed_string_set_attribute(@parent_proxy.attributed_string, color_attribute, start, start + @string.size)
+      end
+      
+      def post_add_content
+        block_result = block&.call
+        @string = block_result if block_result.is_a?(String)
+        @parent_proxy&.post_initialize_child(self)
+      end
+      
+      def draw(area_draw_params)
+        @start = ::LibUI.attributed_string_len(@parent_proxy.attributed_string)
+        ::LibUI.attributed_string_append_unattributed(@parent_proxy.attributed_string, @string)
+        unless color.nil?
+          color_attribute = ::LibUI.new_color_attribute(@color[:r], @color[:g], @color[:b], @color[:a] || 1.0)
+          ::LibUI.attributed_string_set_attribute(@parent_proxy.attributed_string, color_attribute, @start, @start + @string.size)
+        end
+      end
+      
+      def destroy
+        @parent_proxy&.children&.delete(self)
+      end
+      
+      def redraw
+        area_proxy&.queue_redraw_all
+      end
+      
+      def area_proxy
+        @parent_proxy.parent_proxy
+      end
+    end
+  end
+end

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

@@ -180,7 +180,7 @@ module Glimmer
         end
         
         def ext_key_to_symbol(ext_key_value)
-          Glimmer::LibUI.enum_symbols(:ext_key)[ext_key_value - 1].to_s.to_sym if ext_key_value > 0
+          Glimmer::LibUI.enum_value_to_symbol(:ext_key, ext_key_value)
         end
                 
         def modifiers_to_symbols(modifiers_value)

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

@@ -34,9 +34,9 @@ module Glimmer
           {
             family: @font_descriptor.Family.to_s,
             size: @font_descriptor.Size,
-            weight: @font_descriptor.Weight,
-            italic: @font_descriptor.Italic,
-            stretch: @font_descriptor.Stretch
+            weight: Glimmer::LibUI.enum_value_to_symbol(:text_weight, @font_descriptor.Weight),
+            italic: Glimmer::LibUI.enum_value_to_symbol(:text_italic, @font_descriptor.Italic),
+            stretch: Glimmer::LibUI.enum_value_to_symbol(:text_stretch, @font_descriptor.Stretch),
           }
         end
         

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

@@ -34,13 +34,11 @@ module Glimmer
         include Parent
         prepend Transformable
       
-        # TODO support mode without parent proxy
         def initialize(keyword, parent, args, &block)
           @keyword = keyword
           @parent_proxy = parent
           @args = args
           @block = block
-          @enabled = true
           post_add_content if @block.nil?
         end
       

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

@@ -0,0 +1,158 @@
+# 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/libui/control_proxy/area_proxy'
+require 'glimmer/libui/parent'
+require 'glimmer/libui/control_proxy/transformable'
+
+module Glimmer
+  module LibUI
+    class ControlProxy
+      # Proxy for LibUI text objects
+      #
+      # Follows the Proxy Design Pattern
+      class TextProxy < ControlProxy
+        include Parent
+        prepend Transformable
+      
+        def initialize(keyword, parent, args, &block)
+          @keyword = keyword
+          @parent_proxy = parent
+          @args = args
+          @block = block
+          post_add_content if @block.nil?
+        end
+      
+        def post_add_content
+          super
+          if @parent_proxy.nil? && AreaProxy.current_area_draw_params
+            draw(AreaProxy.current_area_draw_params)
+            destroy
+          end
+        end
+        
+        def draw(area_draw_params)
+          children.dup.each {|child| child.draw(area_draw_params)}
+          build_control
+          ::LibUI.draw_text(area_draw_params[:context], @libui, x, y)
+          ::LibUI.draw_free_text_layout(@libui)
+        end
+        
+        def destroy
+          @parent_proxy&.children&.delete(self)
+          ControlProxy.control_proxies.delete(self)
+        end
+        
+        def redraw
+          @parent_proxy&.queue_redraw_all
+        end
+        
+        def x(value = nil)
+          if value.nil?
+            @x ||= args[0] || 0
+          else
+            @x = value
+          end
+        end
+        alias x= x
+        alias set_x x
+        
+        def y(value = nil)
+          if value.nil?
+            @y ||= args[1] || 0
+          else
+            @y = value
+          end
+        end
+        alias y= y
+        alias set_y y
+        
+        def width(value = nil)
+          if value.nil?
+            @width ||= args[2] || (AreaProxy.current_area_draw_params && AreaProxy.current_area_draw_params[:width])
+          else
+            @width = value
+          end
+        end
+        alias width= width
+        alias set_width width
+        
+        def attributed_string
+          @attributed_string ||= ::LibUI.new_attributed_string('')
+        end
+        
+        def default_font(value = nil)
+          if value.nil?
+            @default_font ||= {}
+          else
+            @default_font = value
+          end
+        end
+        alias default_font= default_font
+        alias set_default_font default_font
+        
+        def default_font_descriptor
+          @default_font_descriptor ||= ::LibUI::FFI::FontDescriptor.malloc
+          @default_font_descriptor.Family = default_font[:family] || 'Helvetica'
+          @default_font_descriptor.Size = default_font[:size] || 12.0
+          @default_font_descriptor.Weight = Glimmer::LibUI.enum_symbol_to_value(:text_weight, default_font[:weight], default_symbol: :normal)
+          @default_font_descriptor.Italic = Glimmer::LibUI.enum_symbol_to_value(:text_italic, default_font[:italic], default_symbol: :normal)
+          @default_font_descriptor.Stretch = Glimmer::LibUI.enum_symbol_to_value(:text_stretch, default_font[:stretch], default_symbol: :normal)
+          @default_font_descriptor
+        end
+        
+        def align(value = nil)
+          if value.nil?
+            @align ||= {}
+          else
+            @align = value
+          end
+        end
+        alias align= align
+        alias set_align align
+        
+        def draw_text_layout_params
+          @draw_text_layout_params ||= ::LibUI::FFI::DrawTextLayoutParams.malloc
+          @draw_text_layout_params.String = attributed_string
+          @draw_text_layout_params.DefaultFont = default_font_descriptor
+          @draw_text_layout_params.Width = width
+          @draw_text_layout_params.Align = Glimmer::LibUI.enum_symbol_to_value(:draw_text_align, align, default_symbol: :center)
+          @draw_text_layout_params
+        end
+        
+        private
+        
+        def build_control
+          @libui = ::LibUI.draw_new_text_layout(draw_text_layout_params)
+        end
+        
+        def init_draw_brush(draw_brush, draw_brush_args)
+          draw_brush.Type = Glimmer::LibUI.enum_symbol_to_value(:draw_brush_type, draw_brush_args[:type])
+          draw_brush.R = (draw_brush_args[:r] || draw_brush_args[:red]).to_f / 255.0
+          draw_brush.G = (draw_brush_args[:g] || draw_brush_args[:green]).to_f / 255.0
+          draw_brush.B = (draw_brush_args[:b] || draw_brush_args[:blue]).to_f / 255.0
+          draw_brush.A = (draw_brush_args[:a] || draw_brush_args[:alpha])
+        end
+      end
+    end
+  end
+end

data/lib/glimmer/libui.rb

@@ -96,18 +96,28 @@ module Glimmer
         value
       end
       
-      # Returns ruby underscored symbols for enum values starting with enum name (camelcase, e.g. 'ext_key')
       def enum_symbols(enum_name)
+        enum_symbol_values(enum_name).keys
+      end
+      
+      # Returns ruby underscored symbols for enum values starting with enum name (camelcase, e.g. 'ext_key')
+      def enum_symbol_values(enum_name)
         enum_name = enum_name.to_s.underscore.to_sym
         @enum_symbols ||= {}
-        @enum_symbols[enum_name] ||= ::LibUI.constants.select { |c| c.to_s.start_with?(enum_name.to_s.camelcase(:upper)) }.map { |c| c.to_s.underscore.sub("#{enum_name}_", '').to_sym }
+        @enum_symbols[enum_name] ||= ::LibUI.constants.select { |c| c.to_s.start_with?(enum_name.to_s.camelcase(:upper)) }.map { |c| [c.to_s.underscore.sub("#{enum_name}_", '').to_sym, ::LibUI.const_get(c)] }.to_h
+      end
+      
+      def enum_value_to_symbol(enum_name, enum_value)
+        enum_symbol_values(enum_name).invert[enum_value]
       end
       
-      def enum_symbol_to_value(enum_name, enum_symbol, default_index: 0)
+      def enum_symbol_to_value(enum_name, enum_symbol, default_symbol: nil, default_index: 0)
         if enum_symbol.is_a?(Integer)
           enum_symbol
         elsif enum_symbols(enum_name).include?(enum_symbol.to_s.to_sym)
-          ::LibUI.const_get("#{enum_name}_#{enum_symbol}".camelcase(:upper))
+          enum_symbol_values(enum_name)[enum_symbol]
+        elsif default_symbol
+          enum_symbol_to_value(enum_name, default_symbol)
         else
           enum_symbol_to_value(enum_name, enum_symbols(enum_name)[default_index])
         end
@@ -130,7 +140,7 @@ module Glimmer
       
       # Calls block on the main GUI event loop after time_in_seconds delay, repeating indefinitely by default
       # If `repeat:` keyword arg is passed with an Integer value, it repeats for that number of times
-      # If `repeat:` keyword arg is passed with false or 0, then the block is only called onces
+      # If `repeat:` keyword arg is passed with false or 0, then the block is only called once
       # If block returns false at any point, the timer is stopped from further repetitions regardless of `repeat:` keyword arg value
       # If block returns true at any point, the timer continues for another repetition regardless of `repeat:` keyword arg value
       def timer(time_in_seconds = 0.1, repeat: true, &block)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-libui
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-05 00:00:00.000000000 Z
+date: 2021-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glimmer
@@ -215,6 +215,7 @@ files:
 - examples/basic_area.rb
 - examples/basic_area2.rb
 - examples/basic_button.rb
+- examples/basic_draw_text.rb
 - examples/basic_entry.rb
 - examples/basic_table.rb
 - examples/basic_table_button.rb
@@ -254,9 +255,11 @@ files:
 - lib/glimmer/dsl/libui/property_expression.rb
 - lib/glimmer/dsl/libui/save_file_expression.rb
 - lib/glimmer/dsl/libui/shape_expression.rb
+- lib/glimmer/dsl/libui/string_expression.rb
 - lib/glimmer/dsl/libui/tab_item_expression.rb
 - lib/glimmer/fiddle_consumer.rb
 - lib/glimmer/libui.rb
+- lib/glimmer/libui/attributed_string.rb
 - lib/glimmer/libui/control_proxy.rb
 - lib/glimmer/libui/control_proxy/area_proxy.rb
 - lib/glimmer/libui/control_proxy/area_proxy/scrolling_area_proxy.rb
@@ -310,6 +313,7 @@ files:
 - lib/glimmer/libui/control_proxy/radio_buttons_proxy.rb
 - lib/glimmer/libui/control_proxy/tab_item_proxy.rb
 - lib/glimmer/libui/control_proxy/table_proxy.rb
+- lib/glimmer/libui/control_proxy/text_proxy.rb
 - lib/glimmer/libui/control_proxy/transformable.rb
 - lib/glimmer/libui/control_proxy/window_proxy.rb
 - lib/glimmer/libui/parent.rb