glimmer-dsl-libui 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7033d9033941a3dac53c927ae7ddfdd27127eb4286a936d36e86acb226e57f99
-  data.tar.gz: e88c6c0fd4dd246e4f4f7d9f38cc3c8d10f31e0c3cbbd329de4bdd70b4618cf0
+  metadata.gz: 65d8bf2e6e00eeece96482279bc7dedb367ee21f4a88dd8b96869ff78e051e2f
+  data.tar.gz: 3b3ca0d276675e9787a22f8318089bf4d88f3fea1df0d225d024a1037f63d5fc
 SHA512:
-  metadata.gz: 97140fa3ac706b51f054a047d310172c7469eadca3b90307ff8174443c7f9655a6369e59e6f0ce68c52e7dc1189e5c53abd6654b89e0d5b52f2eed638f347d32
-  data.tar.gz: 24687499c2bd93b4514d6e7d472e57a788d50315b944bc7289a871b7286b91e46e43fd7651b28b0f1ac4a074f80efdae385a1f3b6d3cdbeaab2cbf46cc0f4c30
+  metadata.gz: 00a8a549d4aa8c13fe2824f2fda437d6de675b02108ac3e6196c149db02ee0fd48a6ff11e509155eecf512a9ae66e89c60b850cd99cae44ad1302c1533405330
+  data.tar.gz: 9432f12897bad09cbaf9b72077d15968bc87852a35055e083923779ad311ef5b1221e1a9e1382f7623c0a1524540d98e2e20e91583530facaac5d505cece357c

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Change Log
 
+## 0.2.4
+
+- Support examples/custom_draw_text.rb
+- Support stable `text` control nestable under `area`
+- Support `string` control property `background`
+- Support `string` control property `font`
+- Support `string` control property `underline`
+- Enhance `combobox` to accept `String` value for `selected` item instead of just `Integer` index
+- Add `selected_item` read-only property to `combobox` to return selected item `String` value
+- Fix `color` property support for `string` to accept 255-based rgb values
+- Fix issue with alternating string colors in examples/basic_draw_text.rb
+
 ## 0.2.3
 
 - Update examples/midi_player.rb to read sounds locally from gem

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.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 LibUI 0.2.4
 ## 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.3](#-glimmer-dsl-for-libui-023)
+- [Glimmer DSL for LibUI 0.2.4](#-glimmer-dsl-for-libui-024)
   - [Glimmer GUI DSL Concepts](#glimmer-gui-dsl-concepts)
   - [Usage](#usage)
   - [Girb (Glimmer IRB)](#girb-glimmer-irb)
@@ -245,6 +245,7 @@ Other [Glimmer](https://rubygems.org/gems/glimmer) DSL gems you might be interes
     - [Timer](#timer)
     - [Color The Circles](#color-the-circles)
     - [Basic Draw Text](#basic-draw-text)
+    - [Custom Draw Text](#custom-draw-text)
   - [Contributing to glimmer-dsl-libui](#contributing-to-glimmer-dsl-libui)
   - [Help](#help)
     - [Issues](#issues)
@@ -332,7 +333,7 @@ gem install glimmer-dsl-libui
 Or install via Bundler `Gemfile`:
 
 ```ruby
-gem 'glimmer-dsl-libui', '~> 0.2.3'
+gem 'glimmer-dsl-libui', '~> 0.2.4'
 ```
 
 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.
@@ -4566,8 +4567,6 @@ Linux
 New [Glimmer DSL for LibUI](https://rubygems.org/gems/glimmer-dsl-libui) Version:
 
 ```ruby
-# frozen_string_literal: true
-
 require 'glimmer-dsl-libui'
 
 class Timer
@@ -4579,13 +4578,13 @@ class Timer
   
   def initialize
     @pid = nil
-    @midi_file = File.expand_path('../sounds/AlanWalker-Faded.mid', __dir__)
-    at_exit { stop_midi }
+    @alarm_file = File.expand_path('../sounds/AlanWalker-Faded.mid', __dir__)
+    at_exit { stop_alarm }
     setup_timer
     create_gui
   end
 
-  def stop_midi
+  def stop_alarm
     if @pid
       if @th.alive?
         Process.kill(:SIGKILL, @pid)
@@ -4596,11 +4595,11 @@ class Timer
     end
   end
 
-  def play_midi
-    stop_midi
+  def play_alarm
+    stop_alarm
     if @pid.nil?
       begin
-        @pid = spawn "timidity -G 0.0-10.0 #{@midi_file}"
+        @pid = spawn "timidity -G 0.0-10.0 #{@alarm_file}"
         @th = Process.detach @pid
       rescue Errno::ENOENT
         warn 'Timidty++ not found. Please install Timidity++.'
@@ -4635,7 +4634,8 @@ class Timer
                 @stop_button.enabled = false
                 @started = false
                 unless @played
-                  play_midi
+                  play_alarm
+                  msg_box('Alarm', 'Countdown Is Finished!')
                   @played = true
                 end
               end
@@ -4964,7 +4964,123 @@ 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:
+[LibUI](https://github.com/kojix2/LibUI) Original Version:
+
+```ruby
+require 'libui'
+
+UI = LibUI
+
+UI.init
+
+handler = UI::FFI::AreaHandler.malloc
+area    = UI.new_area(handler)
+
+# 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.
+
+TITLE = 'Michael Ende (1929-1995) The Neverending Story'
+
+str1 = \
+  '  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. '
+
+str2 = \
+  '  A cry of fear escaped Bastian. '
+
+str3 = \
+  '  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. '
+
+str4 = \
+  '  Could she have heard my cry? Bastion wondered in alarm. ' \
+  "But that's not possible. "
+
+str5 = \
+  '  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. '
+
+str = ''
+attr_str = UI.new_attributed_string(str)
+
+def attr_str.append(what, color)
+  case color
+  when :red
+    color_attribute = UI.new_color_attribute(0.0, 0.5, 0.0, 0.7)
+  when :green
+    color_attribute = UI.new_color_attribute(0.5, 0.0, 0.25, 0.7)
+  end
+  start = UI.attributed_string_len(self)
+  UI.attributed_string_append_unattributed(self, what)
+  UI.attributed_string_set_attribute(self, color_attribute, start, start + what.size)
+  UI.attributed_string_append_unattributed(self, "\n\n")
+end
+
+attr_str.append(str1, :green)
+attr_str.append(str2, :red)
+attr_str.append(str3, :green)
+attr_str.append(str4, :red)
+attr_str.append(str5, :green)
+
+Georgia = 'Georgia'
+
+handler_draw_event = Fiddle::Closure::BlockCaller.new(0, [1, 1, 1]) do |_, _, adp|
+  area_draw_params = UI::FFI::AreaDrawParams.new(adp)
+  default_font = UI::FFI::FontDescriptor.malloc
+  default_font.Family = Georgia
+  default_font.Size = 13
+  default_font.Weight = 500
+  default_font.Italic = 0
+  default_font.Stretch = 4
+  params = UI::FFI::DrawTextLayoutParams.malloc
+
+  # UI.font_button_font(font_button, default_font)
+  params.String = attr_str
+  params.DefaultFont = default_font
+  params.Width = area_draw_params.AreaWidth
+  params.Align = 0
+  text_layout = UI.draw_new_text_layout(params)
+  UI.draw_text(area_draw_params.Context, text_layout, 0, 0)
+  UI.draw_free_text_layout(text_layout)
+end
+
+handler.Draw         = handler_draw_event
+# Assigning to local variables
+# This is intended to protect Fiddle::Closure from garbage collection.
+handler.MouseEvent   = (c1 = Fiddle::Closure::BlockCaller.new(0, [0]) {})
+handler.MouseCrossed = (c2 = Fiddle::Closure::BlockCaller.new(0, [0]) {})
+handler.DragBroken   = (c3 = Fiddle::Closure::BlockCaller.new(0, [0]) {})
+handler.KeyEvent     = (c4 = Fiddle::Closure::BlockCaller.new(0, [0]) {})
+
+box = UI.new_vertical_box
+UI.box_set_padded(box, 1)
+UI.box_append(box, area, 1)
+
+main_window = UI.new_window(TITLE, 600, 400, 1)
+UI.window_set_margined(main_window, 1)
+UI.window_set_child(main_window, box)
+
+UI.window_on_closing(main_window) do
+  UI.control_destroy(main_window)
+  UI.quit
+  0
+end
+UI.control_show(main_window)
+
+UI.main
+UI.quit
+```
+
+[Glimmer DSL for LibUI](https://rubygems.org/gems/glimmer-dsl-libui) Version:
 
 ```ruby
 require 'glimmer-dsl-libui'
@@ -4975,8 +5091,78 @@ require 'glimmer-dsl-libui'
 class BasicDrawText
   include Glimmer
   
-  def alternating_color_string(&block)
-    @index ||= 0
+  def alternating_color_string(initial: false, &block)
+    @index = 0 if initial
+    @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 {
+        text { # default arguments for x, y, and width are (0, 0, area_draw_params[:area_width])
+          # align :left # default alignment
+          default_font family: 'Georgia', size: 13, weight: :medium, italic: :normal, stretch: :normal
+            
+          alternating_color_string(initial: true) {
+            '  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. '
+          }
+        }
+      }
+    }.show
+  end
+end
+
+BasicDrawText.new.launch
+```
+
+[Glimmer DSL for LibUI](https://rubygems.org/gems/glimmer-dsl-libui) Version 2:
+
+```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(initial: false, &block)
+    @index = 0 if initial
     @index += 1
     string {
       if @index.odd?
@@ -4995,11 +5181,11 @@ class BasicDrawText
       
       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
+          text { # default arguments for x, y, and width are (0, 0, area_draw_params[:area_width])
+            # align :left # default alignment
+            default_font family: 'Georgia', size: 13, weight: :medium, italic: :normal, stretch: :normal
               
-            alternating_color_string {
+            alternating_color_string(initial: true) {
               '  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 ' \
@@ -5036,6 +5222,222 @@ end
 BasicDrawText.new.launch
 ```
 
+### Custom Draw Text
+
+[examples/custom_draw_text.rb](examples/custom_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/custom_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/custom_draw_text'"
+```
+
+Mac
+
+![glimmer-dsl-libui-mac-custom-draw-text.png](images/glimmer-dsl-libui-mac-custom-draw-text.png)
+![glimmer-dsl-libui-mac-custom-draw-text-changed.png](images/glimmer-dsl-libui-mac-custom-draw-text-changed.png)
+
+Linux
+
+![glimmer-dsl-libui-linux-custom-draw-text.png](images/glimmer-dsl-libui-linux-custom-draw-text.png)
+![glimmer-dsl-libui-linux-custom-draw-text-changed.png](images/glimmer-dsl-libui-linux-custom-draw-text-changed.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 CustomDrawText
+  include Glimmer
+  
+  def launch
+    window('Michael Ende (1929-1995) The Neverending Story', 600, 400) {
+      margined true
+      
+      vertical_box {
+        form {
+          stretchy false
+          
+          font_button { |fb|
+            label 'Font'
+            
+            on_changed do
+              @string.font = fb.font
+            end
+          }
+          color_button { |cb|
+            label 'Color'
+            
+            on_changed do
+              @string.color = cb.color
+            end
+          }
+          color_button { |cb|
+            label 'Background'
+            
+            on_changed do
+              @string.background = cb.color
+            end
+          }
+          combobox { |c|
+            label 'Underline'
+            items Glimmer::LibUI.enum_symbols(:underline).map(&:to_s).map {|word| word.split('_').map(&:capitalize).join(' ')}
+            selected 'None'
+            
+            on_selected do
+              @string.underline = c.selected_item.underscore
+            end
+          }
+        }
+        
+        area {
+          text { # default arguments for x, y, and width are (0, 0, area_draw_params[:area_width])
+            # align :left # default alignment
+              
+            @string = 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. ' \
+              "\n\n" \
+              '  A cry of fear escaped Bastian. ' \
+              "\n\n" \
+              '  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. ' \
+              "\n\n" \
+              '  Could she have heard my cry? Bastion wondered in alarm. ' \
+              "But that's not possible. " \
+              "\n\n" \
+              '  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. ' \
+              "\n\n"
+            }
+          }
+        }
+      }
+    }.show
+  end
+end
+
+CustomDrawText.new.launch
+```
+
+New [Glimmer DSL for LibUI](https://rubygems.org/gems/glimmer-dsl-libui) Version 2:
+
+```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 CustomDrawText
+  include Glimmer
+  
+  def launch
+    window('Michael Ende (1929-1995) The Neverending Story', 600, 400) {
+      margined true
+      
+      vertical_box {
+        form {
+          stretchy false
+          
+          font_button { |fb|
+            label 'Font'
+            
+            on_changed do
+              @font = fb.font
+              @area.queue_redraw_all
+            end
+          }
+          color_button { |cb|
+            label 'Color'
+            
+            on_changed do
+              @color = cb.color
+              @area.queue_redraw_all
+            end
+          }
+          color_button { |cb|
+            label 'Background'
+            
+            on_changed do
+              @background = cb.color
+              @area.queue_redraw_all
+            end
+          }
+          combobox { |c|
+            label 'Underline'
+            items Glimmer::LibUI.enum_symbols(:underline).map(&:to_s).map {|word| word.split('_').map(&:capitalize).join(' ')}
+            selected 'None'
+            
+            on_selected do
+              @underline = c.selected_item.underscore
+              @area.queue_redraw_all
+            end
+          }
+        }
+        
+        @area = area {
+          on_draw do |area_draw_params|
+            text { # default arguments for x, y, and width are (0, 0, area_draw_params[:area_width])
+              # align :left # default alignment
+                
+              @string = string {
+                font @font unless @font.nil?
+                color @color unless @color.nil?
+                background @background unless @background.nil?
+                underline @underline unless @underline.nil?
+                
+                '  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. ' \
+                "\n\n" \
+                '  A cry of fear escaped Bastian. ' \
+                "\n\n" \
+                '  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. ' \
+                "\n\n" \
+                '  Could she have heard my cry? Bastion wondered in alarm. ' \
+                "But that's not possible. " \
+                "\n\n" \
+                '  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. ' \
+                "\n\n"
+              }
+            }
+          end
+        }
+      }
+    }.show
+  end
+end
+
+CustomDrawText.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.3
+0.2.4

data/examples/basic_draw_text.rb

@@ -6,14 +6,14 @@ require 'glimmer-dsl-libui'
 class BasicDrawText
   include Glimmer
   
-  def alternating_color_string(&block)
-    @index ||= 0
+  def alternating_color_string(initial: false, &block)
+    @index = 0 if initial
     @index += 1
     string {
       if @index.odd?
-        color r: 0.5, g: 0, b: 0.25, a: 0.7
+        color r: 128, g: 0, b: 64, a: 0.7
       else
-        color r: 0, g: 0.5, b: 0, a: 0.7
+        color r: 0, g: 128, b: 0, a: 0.7
       end
       
       block.call + "\n\n"
@@ -25,40 +25,38 @@ class BasicDrawText
       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. '
-            }
+        text { # default arguments for x, y, and width are (0, 0, area_draw_params[:area_width])
+          # align :left # default alignment
+          default_font family: 'Georgia', size: 13, weight: :medium, italic: :normal, stretch: :normal
+            
+          alternating_color_string(initial: true) {
+            '  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. '
           }
-        end
+          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. '
+          }
+        }
       }
     }.show
   end

data/examples/basic_draw_text2.rb

@@ -0,0 +1,68 @@
+
+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(initial: false, &block)
+    @index = 0 if initial
+    @index += 1
+    string {
+      if @index.odd?
+        color r: 128, g: 0, b: 64, a: 0.7
+      else
+        color r: 0, g: 128, 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 { # default arguments for x, y, and width are (0, 0, area_draw_params[:area_width])
+            # align :left # default alignment
+            default_font family: 'Georgia', size: 13, weight: :medium, italic: :normal, stretch: :normal
+              
+            alternating_color_string(initial: true) {
+              '  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/custom_draw_text.rb

@@ -0,0 +1,84 @@
+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 CustomDrawText
+  include Glimmer
+  
+  def launch
+    window('Michael Ende (1929-1995) The Neverending Story', 600, 400) {
+      margined true
+      
+      vertical_box {
+        form {
+          stretchy false
+          
+          font_button { |fb|
+            label 'Font'
+            
+            on_changed do
+              @string.font = fb.font
+            end
+          }
+          color_button { |cb|
+            label 'Color'
+            
+            on_changed do
+              @string.color = cb.color
+            end
+          }
+          color_button { |cb|
+            label 'Background'
+            
+            on_changed do
+              @string.background = cb.color
+            end
+          }
+          combobox { |c|
+            label 'Underline'
+            items Glimmer::LibUI.enum_symbols(:underline).map(&:to_s).map {|word| word.split('_').map(&:capitalize).join(' ')}
+            selected 'None'
+            
+            on_selected do
+              @string.underline = c.selected_item.underscore
+            end
+          }
+        }
+        
+        area {
+          text { # default arguments for x, y, and width are (0, 0, area_draw_params[:area_width])
+            # align :left # default alignment
+              
+            @string = 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. ' \
+              "\n\n" \
+              '  A cry of fear escaped Bastian. ' \
+              "\n\n" \
+              '  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. ' \
+              "\n\n" \
+              '  Could she have heard my cry? Bastion wondered in alarm. ' \
+              "But that's not possible. " \
+              "\n\n" \
+              '  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. ' \
+              "\n\n"
+            }
+          }
+        }
+      }
+    }.show
+  end
+end
+
+CustomDrawText.new.launch

data/examples/custom_draw_text2.rb

@@ -0,0 +1,95 @@
+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 CustomDrawText
+  include Glimmer
+  
+  def launch
+    window('Michael Ende (1929-1995) The Neverending Story', 600, 400) {
+      margined true
+      
+      vertical_box {
+        form {
+          stretchy false
+          
+          font_button { |fb|
+            label 'Font'
+            
+            on_changed do
+              @font = fb.font
+              @area.queue_redraw_all
+            end
+          }
+          color_button { |cb|
+            label 'Color'
+            
+            on_changed do
+              @color = cb.color
+              @area.queue_redraw_all
+            end
+          }
+          color_button { |cb|
+            label 'Background'
+            
+            on_changed do
+              @background = cb.color
+              @area.queue_redraw_all
+            end
+          }
+          combobox { |c|
+            label 'Underline'
+            items Glimmer::LibUI.enum_symbols(:underline).map(&:to_s).map {|word| word.split('_').map(&:capitalize).join(' ')}
+            selected 'None'
+            
+            on_selected do
+              @underline = c.selected_item.underscore
+              @area.queue_redraw_all
+            end
+          }
+        }
+        
+        @area = area {
+          on_draw do |area_draw_params|
+            text { # default arguments for x, y, and width are (0, 0, area_draw_params[:area_width])
+              # align :left # default alignment
+                
+              @string = string {
+                font @font
+                color @color
+                background @background
+                underline @underline
+                
+                '  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. ' \
+                "\n\n" \
+                '  A cry of fear escaped Bastian. ' \
+                "\n\n" \
+                '  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. ' \
+                "\n\n" \
+                '  Could she have heard my cry? Bastion wondered in alarm. ' \
+                "But that's not possible. " \
+                "\n\n" \
+                '  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. ' \
+                "\n\n"
+              }
+            }
+          end
+        }
+      }
+    }.show
+  end
+end
+
+CustomDrawText.new.launch

data/lib/glimmer/libui/attributed_string.rb

@@ -40,24 +40,48 @@ module Glimmer
       end
       
       def font(value = nil)
-#         UI.attributed_string_set_attribute(@parent_proxy.attributed_string, color_attribute, start, start + @string.size)
+        if value.nil?
+          @font
+        else
+          @font = value
+          redraw
+        end
       end
+      alias font= font
+      alias set_font font
       
       def color(value = nil)
         if value.nil?
           @color
         else
           @color = Glimmer::LibUI.interpret_color(value)
+          redraw
         end
       end
+      alias color= color
+      alias set_color color
       
       def background(value = nil)
-#         UI.attributed_string_set_attribute(@parent_proxy.attributed_string, color_attribute, start, start + @string.size)
+        if value.nil?
+          @background
+        else
+          @background = Glimmer::LibUI.interpret_color(value)
+          redraw
+        end
       end
+      alias background= background
+      alias background background
       
       def underline(value = nil)
-#         UI.attributed_string_set_attribute(@parent_proxy.attributed_string, color_attribute, start, start + @string.size)
+        if value.nil?
+          @underline
+        else
+          @underline = value
+          redraw
+        end
       end
+      alias underline= underline
+      alias underline underline
       
       def post_add_content
         block_result = block&.call
@@ -69,9 +93,30 @@ module Glimmer
         @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)
+          color_attribute = ::LibUI.new_color_attribute(@color[:r].to_f / 255.0, @color[:g].to_f / 255.0, @color[:b].to_f / 255.0, @color[:a] || 1.0)
           ::LibUI.attributed_string_set_attribute(@parent_proxy.attributed_string, color_attribute, @start, @start + @string.size)
         end
+        unless background.nil?
+          background_attribute = ::LibUI.new_background_attribute(@background[:r].to_f / 255.0, @background[:g].to_f / 255.0, @background[:b].to_f / 255.0, @background[:a] || 1.0)
+          ::LibUI.attributed_string_set_attribute(@parent_proxy.attributed_string, background_attribute, @start, @start + @string.size)
+        end
+        unless underline.nil?
+          underline_attribute = ::LibUI.new_underline_attribute(Glimmer::LibUI.enum_symbol_to_value(:underline, @underline))
+          ::LibUI.attributed_string_set_attribute(@parent_proxy.attributed_string, underline_attribute, @start, @start + @string.size)
+        end
+        unless font.nil?
+          family_attribute = ::LibUI.new_family_attribute(font[:family])
+          ::LibUI.attributed_string_set_attribute(@parent_proxy.attributed_string, family_attribute, @start, @start + @string.size)
+          size_attribute = ::LibUI.new_size_attribute(font[:size])
+          ::LibUI.attributed_string_set_attribute(@parent_proxy.attributed_string, size_attribute, @start, @start + @string.size)
+          weight_attribute = ::LibUI.new_weight_attribute(Glimmer::LibUI.enum_symbol_to_value(:text_weight, font[:weight]))
+          ::LibUI.attributed_string_set_attribute(@parent_proxy.attributed_string, weight_attribute, @start, @start + @string.size)
+          italic_attribute = ::LibUI.new_italic_attribute(Glimmer::LibUI.enum_symbol_to_value(:text_italic, font[:italic]))
+          ::LibUI.attributed_string_set_attribute(@parent_proxy.attributed_string, italic_attribute, @start, @start + @string.size)
+          stretch_attribute = ::LibUI.new_stretch_attribute(Glimmer::LibUI.enum_symbol_to_value(:text_stretch, font[:stretch]))
+          ::LibUI.attributed_string_set_attribute(@parent_proxy.attributed_string, stretch_attribute, @start, @start + @string.size)
+        end
+        destroy if area_proxy.nil?
       end
       
       def destroy

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

@@ -29,7 +29,6 @@ module Glimmer
       # Follows the Proxy Design Pattern
       class ColorButtonProxy < ControlProxy
         def color(value = nil)
-          # TODO support hex color value
           if value.nil?
             @red ||= Fiddle::Pointer.malloc(8) # double
             @green ||= Fiddle::Pointer.malloc(8) # double

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

@@ -28,6 +28,20 @@ module Glimmer
       #
       # Follows the Proxy Design Pattern
       class ComboboxProxy < ControlProxy
+        def selected(value = nil)
+          if value.nil?
+            super()
+          else
+            if value.is_a?(String)
+              super(items.index(value).to_i)
+            else
+              super
+            end
+          end
+        end
+        alias selected= selected
+        alias set_selected selected
+      
         def items(*values)
           values = values.first if values.first.is_a?(Array)
           if values.empty?
@@ -39,6 +53,10 @@ module Glimmer
         end
         alias set_items items
         alias items= items
+        
+        def selected_item
+          items[selected]
+        end
       end
     end
   end

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

@@ -51,6 +51,7 @@ module Glimmer
         end
         
         def draw(area_draw_params)
+          reset_attributed_string
           children.dup.each {|child| child.draw(area_draw_params)}
           build_control
           ::LibUI.draw_text(area_draw_params[:context], @libui, x, y)
@@ -88,23 +89,35 @@ module Glimmer
         
         def width(value = nil)
           if value.nil?
-            @width ||= args[2] || (AreaProxy.current_area_draw_params && AreaProxy.current_area_draw_params[:width])
+            @width ||= args[2] || (AreaProxy.current_area_draw_params && AreaProxy.current_area_draw_params[:area_width])
           else
             @width = value
+            redraw
           end
         end
         alias width= width
         alias set_width width
         
         def attributed_string
-          @attributed_string ||= ::LibUI.new_attributed_string('')
+          @attributed_string ||= reset_attributed_string
+        end
+        
+        def reset_attributed_string
+          @attributed_string = ::LibUI.new_attributed_string('')
         end
         
         def default_font(value = nil)
           if value.nil?
-            @default_font ||= {}
+            @default_font ||= {
+              family: 'Helvetica',
+              size: 12.0,
+              weight: :normal,
+              italic: :normal,
+              stretch: :normal,
+            }
           else
             @default_font = value
+            redraw
           end
         end
         alias default_font= default_font
@@ -122,9 +135,10 @@ module Glimmer
         
         def align(value = nil)
           if value.nil?
-            @align ||= {}
+            @align
           else
             @align = value
+            redraw
           end
         end
         alias align= align
@@ -135,7 +149,7 @@ module Glimmer
           @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.Align = Glimmer::LibUI.enum_symbol_to_value(:draw_text_align, align, default_symbol: :left)
           @draw_text_layout_params
         end
         

data/lib/glimmer/libui.rb

@@ -115,7 +115,7 @@ module Glimmer
         if enum_symbol.is_a?(Integer)
           enum_symbol
         elsif enum_symbols(enum_name).include?(enum_symbol.to_s.to_sym)
-          enum_symbol_values(enum_name)[enum_symbol]
+          enum_symbol_values(enum_name)[enum_symbol.to_s.to_sym]
         elsif default_symbol
           enum_symbol_to_value(enum_name, default_symbol)
         else

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-libui
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Andy Maleh
@@ -216,6 +216,7 @@ files:
 - examples/basic_area2.rb
 - examples/basic_button.rb
 - examples/basic_draw_text.rb
+- examples/basic_draw_text2.rb
 - examples/basic_entry.rb
 - examples/basic_table.rb
 - examples/basic_table_button.rb
@@ -230,6 +231,8 @@ files:
 - examples/color_button.rb
 - examples/color_the_circles.rb
 - examples/control_gallery.rb
+- examples/custom_draw_text.rb
+- examples/custom_draw_text2.rb
 - examples/date_time_picker.rb
 - examples/dynamic_area.rb
 - examples/dynamic_area2.rb