glimmer-dsl-libui 0.3.3 → 0.4.1

data/VERSION

@@ -1 +1 @@
-0.3.3
+0.4.1

data/examples/basic_area.rb

@@ -7,9 +7,7 @@ window('Basic Area', 400, 400) {
   
   vertical_box {
     area {
-      path { # a stable path is added declaratively
-        rectangle(0, 0, 400, 400)
-        
+      rectangle(0, 0, 400, 400) { # stable implicit path shape, added declaratively
         fill r: 102, g: 102, b: 204, a: 1.0
       }
     }

data/examples/basic_area2.rb

@@ -8,9 +8,7 @@ window('Basic Area', 400, 400) {
   vertical_box {
     area {
       on_draw do |area_draw_params|
-        path { # a dynamic path is added semi-declaratively inside on_draw block
-          rectangle(0, 0, 400, 400)
-          
+        rectangle(0, 0, 400, 400) { # dynamic implicit path shape, added semi-declaratively inside on_draw block
           fill r: 102, g: 102, b: 204, a: 1.0
         }
       end

data/examples/basic_area3.rb

@@ -0,0 +1,17 @@
+require 'glimmer-dsl-libui'
+
+include Glimmer
+
+window('Basic Area', 400, 400) {
+  margined true
+  
+  vertical_box {
+    area {
+      path { # stable path, added declaratively
+        rectangle(0, 0, 400, 400)
+        
+        fill r: 102, g: 102, b: 204, a: 1.0
+      }
+    }
+  }
+}.show

data/examples/basic_area4.rb

@@ -0,0 +1,19 @@
+require 'glimmer-dsl-libui'
+
+include Glimmer
+
+window('Basic Area', 400, 400) {
+  margined true
+  
+  vertical_box {
+    area {
+      on_draw do |area_draw_params|
+        path { # dynamic path, added semi-declaratively inside on_draw block
+          rectangle(0, 0, 400, 400)
+          
+          fill r: 102, g: 102, b: 204, a: 1.0
+        }
+      end
+    }
+  }
+}.show

data/examples/basic_scrolling_area.rb

@@ -0,0 +1,79 @@
+require 'glimmer-dsl-libui'
+
+class BasicScrollingArea
+  include Glimmer
+  
+  SCROLLING_AREA_WIDTH = 800
+  SCROLLING_AREA_HEIGHT = 400
+  SCROLLING_AREA_PADDING_X = 20
+  SCROLLING_AREA_PADDING_Y = 20
+  
+  def initialize
+    @x = SCROLLING_AREA_PADDING_X
+    @y = SCROLLING_AREA_HEIGHT - SCROLLING_AREA_PADDING_Y
+    create_gui
+    Glimmer::LibUI.timer(0.01) do
+      @x += SCROLLING_AREA_PADDING_X
+      @y = [[@y + rand(SCROLLING_AREA_PADDING_Y*4)*(rand(2) == 0 ? -1 : 1), SCROLLING_AREA_PADDING_Y].max, SCROLLING_AREA_HEIGHT - SCROLLING_AREA_PADDING_Y].min
+      @graph.content { # re-open @graph's content and add a line
+        line(@x, @y)
+      }
+      # if there is a need to enlarge scrolling area, call `@scrolling_area.set_size(new_width, new_height)`
+      # Note that `#scroll_to` does not seem to work on Linux, but normal scrolling does.
+      @scrolling_area.scroll_to(@x - (SCROLLING_AREA_WIDTH/2), @y) # 3rd and 4th arguments for width and height are assumed as those of main window by default if not supplied
+      # return false to stop timer once @x exceeds scrolling area width - padding
+      false if @x >= (SCROLLING_AREA_WIDTH - SCROLLING_AREA_PADDING_X*2)
+    end
+  end
+  
+  def launch
+    @main_window.show
+  end
+  
+  def x_axis
+    polyline(SCROLLING_AREA_PADDING_X, SCROLLING_AREA_HEIGHT - SCROLLING_AREA_PADDING_Y, SCROLLING_AREA_WIDTH - SCROLLING_AREA_PADDING_X*2, SCROLLING_AREA_HEIGHT - SCROLLING_AREA_PADDING_Y) {
+      stroke :black, thickness: 3
+    }
+    
+    ((SCROLLING_AREA_WIDTH - SCROLLING_AREA_PADDING_X*4) / SCROLLING_AREA_PADDING_X).times do |x_multiplier|
+      x = x_multiplier*SCROLLING_AREA_PADDING_X + SCROLLING_AREA_PADDING_X*2
+      y = SCROLLING_AREA_HEIGHT - SCROLLING_AREA_PADDING_Y
+      
+      polyline(x, y, x, y + SCROLLING_AREA_PADDING_Y/2) {
+        stroke :black, thickness: 2
+      }
+    end
+  end
+  
+  def y_axis
+    polyline(SCROLLING_AREA_PADDING_X, SCROLLING_AREA_PADDING_Y, SCROLLING_AREA_PADDING_X, SCROLLING_AREA_HEIGHT - SCROLLING_AREA_PADDING_Y) {
+      stroke :black, thickness: 3
+    }
+    
+    ((SCROLLING_AREA_HEIGHT - SCROLLING_AREA_PADDING_Y*3) / SCROLLING_AREA_PADDING_Y).times do |y_multiplier|
+      x = SCROLLING_AREA_PADDING_X
+      y = y_multiplier*SCROLLING_AREA_PADDING_Y + SCROLLING_AREA_PADDING_Y*2
+      
+      polyline(x, y, x - SCROLLING_AREA_PADDING_X/2, y) {
+        stroke :black, thickness: 2
+      }
+    end
+  end
+  
+  def create_gui
+    @main_window = window('Basic Scrolling Area', SCROLLING_AREA_WIDTH / 2, SCROLLING_AREA_HEIGHT) {
+      resizable false
+      
+      @scrolling_area = scrolling_area(SCROLLING_AREA_WIDTH, SCROLLING_AREA_HEIGHT) { # double width of window enables horizontal scrolling
+        x_axis
+        y_axis
+        
+        @graph = figure(SCROLLING_AREA_PADDING_X, SCROLLING_AREA_HEIGHT - SCROLLING_AREA_PADDING_Y) {
+          stroke :blue, thickness: 2
+        }
+      }
+    }
+  end
+end
+
+BasicScrollingArea.new.launch

data/examples/color_the_circles.rb

@@ -26,7 +26,8 @@ class ColorTheCircles
   end
   
   def register_observers
-    observer = Glimmer::DataBinding::Observer.proc do |new_score|
+    # observe automatically enhances self to become Glimmer::DataBinding::ObservableModel and notify observer block of score attribute changes
+    observe(self, :score) do |new_score|
       Glimmer::LibUI.queue_main do
         @score_label.text = new_score.to_s
         if new_score == -20
@@ -40,7 +41,6 @@ class ColorTheCircles
         end
       end
     end
-    observer.observe(self, :score) # automatically enhances self to become Glimmer::DataBinding::ObservableModel and notify observer on score attribute changes
   end
   
   def setup_circle_factory

data/examples/method_based_custom_keyword.rb

@@ -34,9 +34,9 @@ def label_pair(model, attribute, value)
     name_label = label(attribute.to_s.underscore.split('_').map(&:capitalize).join(' '))
     value_label = label(value.to_s)
   }
-  Glimmer::DataBinding::Observer.proc do
+  observe(model, attribute) do
     value_label.text = model.send(attribute)
-  end.observe(model, attribute)
+  end
 end
 
 def address(address)

data/examples/midi_player.rb

@@ -18,12 +18,8 @@ class TinyMidiPlayer
 
   def stop_midi
     if @pid
-      if @th.alive?
-        Process.kill(:SIGKILL, @pid)
-        @pid = nil
-      else
-        @pid = nil
-      end
+      Process.kill(:SIGKILL, @pid) if @th.alive?
+      @pid = nil
     end
   end
 

data/examples/snake/model/game.rb

@@ -6,8 +6,8 @@ require_relative 'apple'
 class Snake
   module Model
     class Game
-      WIDTH_DEFAULT = 40
-      HEIGHT_DEFAULT = 40
+      WIDTH_DEFAULT = 20
+      HEIGHT_DEFAULT = 20
       FILE_HIGH_SCORE = File.expand_path(File.join(Dir.home, '.glimmer-snake'))
       
       attr_reader :width, :height

data/examples/snake/presenter/grid.rb

@@ -1,10 +1,12 @@
-require 'glimmer/data_binding/observer'
+require 'glimmer'
 require_relative '../model/game'
 require_relative 'cell'
 
 class Snake
   module Presenter
     class Grid
+      include Glimmer
+      
       attr_reader :game, :cells
       
       def initialize(game = Model::Game.new)
@@ -14,7 +16,7 @@ class Snake
             Cell.new(grid: self, row: row, column: column)
           end
         end
-        Glimmer::DataBinding::Observer.proc do |new_vertebrae|
+        observe(@game.snake, :vertebrae) do |new_vertebrae|
           occupied_snake_positions = @game.snake.vertebrae.map {|v| [v.row, v.column]}
           @cells.each_with_index do |row_cells, row|
             row_cells.each_with_index do |cell, column|
@@ -27,7 +29,7 @@ class Snake
               end
             end
           end
-        end.observe(@game.snake, :vertebrae)
+        end
       end
       
       def clear

data/examples/snake.rb

@@ -1,12 +1,12 @@
 require 'glimmer-dsl-libui'
-require 'glimmer/data_binding/observer'
 
 require_relative 'snake/presenter/grid'
 
 class Snake
+  include Glimmer
+  
   CELL_SIZE = 15
   SNAKE_MOVE_DELAY = 0.1
-  include Glimmer
   
   def initialize
     @game = Model::Game.new
@@ -21,48 +21,38 @@ class Snake
   end
   
   def register_observers
-    @game.height.times do |row|
-      @game.width.times do |column|
-        Glimmer::DataBinding::Observer.proc do |new_color|
-          @cell_grid[row][column].fill = new_color
-        end.observe(@grid.cells[row][column], :color)
-      end
-    end
-    
-    Glimmer::DataBinding::Observer.proc do |game_over|
+    observe(@game, :over) do |game_over|
       Glimmer::LibUI.queue_main do
         if game_over
           msg_box('Game Over!', "Score: #{@game.score} | High Score: #{@game.high_score}")
           @game.start
         end
       end
-    end.observe(@game, :over)
+    end
     
     Glimmer::LibUI.timer(SNAKE_MOVE_DELAY) do
-      unless @game.over?
-        @game.snake.move
-        @main_window.title = "Glimmer Snake (Score: #{@game.score} | High Score: #{@game.high_score})"
-      end
+      @game.snake.move unless @game.over?
     end
   end
   
   def create_gui
-    @cell_grid = []
-    @main_window = window('Glimmer Snake', @game.width * CELL_SIZE, @game.height * CELL_SIZE) {
+    @main_window = window {
+      # data-bind window title to game score, converting it to a title string on read from the model
+      title <= [@game, :score, on_read: -> (score) {"Glimmer Snake (Score: #{@game.score})"}]
+      content_size @game.width * CELL_SIZE, @game.height * CELL_SIZE
       resizable false
       
       vertical_box {
         padded false
         
         @game.height.times do |row|
-          @cell_grid << []
           horizontal_box {
             padded false
             
             @game.width.times do |column|
               area {
-                @cell_grid.last << square(0, 0, CELL_SIZE) {
-                  fill Presenter::Cell::COLOR_CLEAR
+                square(0, 0, CELL_SIZE) {
+                  fill <= [@grid.cells[row][column], :color] # data-bind square fill to grid cell color
                 }
                 
                 on_key_up do |area_key_event|

data/examples/tetris.rb

@@ -42,7 +42,7 @@ class Tetris
   end
   
   def register_observers
-    Glimmer::DataBinding::Observer.proc do |game_over|
+    observe(@game, :game_over) do |game_over|
       if game_over
         @pause_menu_item.enabled = false
         show_game_over_dialog
@@ -50,11 +50,11 @@ class Tetris
         @pause_menu_item.enabled = true
         start_moving_tetrominos_down
       end
-    end.observe(@game, :game_over)
+    end
     
     Model::Game::PLAYFIELD_HEIGHT.times do |row|
       Model::Game::PLAYFIELD_WIDTH.times do |column|
-        Glimmer::DataBinding::Observer.proc do |new_color|
+        observe(@game.playfield[row][column], :color) do |new_color|
           Glimmer::LibUI.queue_main do
             color = Glimmer::LibUI.interpret_color(new_color)
             block = @playfield_blocks[row][column]
@@ -65,13 +65,13 @@ class Tetris
             block[:left_bevel_edge].fill = {r: color[:r] - BEVEL_CONSTANT, g: color[:g] - BEVEL_CONSTANT, b: color[:b] - BEVEL_CONSTANT}
             block[:border_square].stroke = new_color == Model::Block::COLOR_CLEAR ? COLOR_GRAY : color
           end
-        end.observe(@game.playfield[row][column], :color)
+        end
       end
     end
     
     Model::Game::PREVIEW_PLAYFIELD_HEIGHT.times do |row|
       Model::Game::PREVIEW_PLAYFIELD_WIDTH.times do |column|
-        Glimmer::DataBinding::Observer.proc do |new_color|
+        observe(@game.preview_playfield[row][column], :color) do |new_color|
           Glimmer::LibUI.queue_main do
             color = Glimmer::LibUI.interpret_color(new_color)
             block = @preview_playfield_blocks[row][column]
@@ -82,27 +82,27 @@ class Tetris
             block[:left_bevel_edge].fill = {r: color[:r] - BEVEL_CONSTANT, g: color[:g] - BEVEL_CONSTANT, b: color[:b] - BEVEL_CONSTANT}
             block[:border_square].stroke = new_color == Model::Block::COLOR_CLEAR ? COLOR_GRAY : color
           end
-        end.observe(@game.preview_playfield[row][column], :color)
+        end
       end
     end
 
-    Glimmer::DataBinding::Observer.proc do |new_score|
+    observe(@game, :score) do |new_score|
       Glimmer::LibUI.queue_main do
         @score_label.text = new_score.to_s
       end
-    end.observe(@game, :score)
+    end
 
-    Glimmer::DataBinding::Observer.proc do |new_lines|
+    observe(@game, :lines) do |new_lines|
       Glimmer::LibUI.queue_main do
         @lines_label.text = new_lines.to_s
       end
-    end.observe(@game, :lines)
+    end
 
-    Glimmer::DataBinding::Observer.proc do |new_level|
+    observe(@game, :level) do |new_level|
       Glimmer::LibUI.queue_main do
         @level_label.text = new_level.to_s
       end
-    end.observe(@game, :level)
+    end
   end
   
   def menu_bar

data/examples/tic_tac_toe.rb

@@ -16,17 +16,9 @@ class TicTacToe
   end
   
   def register_observers
-    Glimmer::DataBinding::Observer.proc do |game_status|
+    observe(@tic_tac_toe_board, :game_status) do |game_status|
       display_win_message if game_status == Board::WIN
       display_draw_message if game_status == Board::DRAW
-    end.observe(@tic_tac_toe_board, :game_status)
-    
-    3.times.map do |row|
-      3.times.map do |column|
-        Glimmer::DataBinding::Observer.proc do |sign|
-          @cells[row][column].string = sign
-        end.observe(@tic_tac_toe_board[row + 1, column + 1], :sign) # board model is 1-based
-      end
     end
   end
 
@@ -34,12 +26,10 @@ class TicTacToe
     @main_window = window('Tic-Tac-Toe', 180, 180) {
       resizable false
       
-      @cells = []
       vertical_box {
         padded false
         
         3.times.map do |row|
-          @cells << []
           horizontal_box {
             padded false
             
@@ -49,8 +39,9 @@ class TicTacToe
                   stroke :black, thickness: 2
                 }
                 text(23, 19) {
-                  @cells[row] << string('') {
+                  string {
                     font family: 'Arial', size: OS.mac? ? 20 : 16
+                    string <= [@tic_tac_toe_board[row + 1, column + 1], :sign] # board model is 1-based
                   }
                 }
                 on_mouse_up do

data/examples/timer.rb

@@ -19,12 +19,8 @@ class Timer
 
   def stop_alarm
     if @pid
-      if @th.alive?
-        Process.kill(:SIGKILL, @pid)
-        @pid = nil
-      else
-        @pid = nil
-      end
+      Process.kill(:SIGKILL, @pid) if @th.alive?
+      @pid = nil
     end
   end
 

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

@@ -0,0 +1,36 @@
+# 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/bind_expression'
+
+module Glimmer
+  module DSL
+    module Libui
+      # Responsible for setting up the return value of the bind keyword (command symbol)
+      # as a ModelBinding. It is then used by another command handler like
+      # DataBindingExpression
+      class BindExpression < StaticExpression
+        include Glimmer::DSL::BindExpression
+      end
+    end
+  end
+end

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

@@ -0,0 +1,47 @@
+# 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/expression'
+require 'glimmer/data_binding/model_binding'
+
+module Glimmer
+  module DSL
+    module Libui
+      # Responsible for wiring data-binding
+      # Depends on BindExpression
+      class DataBindingExpression < Expression
+        def can_interpret?(parent, keyword, *args, &block)
+          args.size == 1 and
+            args[0].is_a?(DataBinding::ModelBinding)
+        end
+  
+        def interpret(parent, keyword, *args, &block)
+          model_binding = args[0]
+          model_attribute_observer = Glimmer::DataBinding::Observer.proc do
+            parent.send("#{keyword}=", model_binding.evaluate_property)
+          end
+          model_attribute_observer.observe(model_binding)
+          model_attribute_observer.call # initial update
+        end
+      end
+    end
+  end
+end

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

@@ -37,7 +37,10 @@ module Glimmer
         Libui,
         %w[
           listener
+          data_binding
+          shine_data_binding
           property
+          string
           control
           shape
         ]

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

@@ -0,0 +1,35 @@
+# 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/top_level_expression'
+require 'glimmer/dsl/observe_expression'
+
+module Glimmer
+  module DSL
+    module SWT
+      class ObserveExpression < StaticExpression
+        include TopLevelExpression
+        include Glimmer::DSL::ObserveExpression
+      end
+    end
+  end
+end

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

@@ -0,0 +1,42 @@
+# 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/expression'
+require 'glimmer/data_binding/model_binding'
+require 'glimmer/data_binding/shine'
+
+module Glimmer
+  module DSL
+    module Libui
+      class ShineDataBindingExpression < Expression
+        def can_interpret?(parent, keyword, *args, &block)
+          args.size == 0 and
+            block.nil? and
+            parent.respond_to?(keyword, *args, &block)
+        end
+  
+        def interpret(parent, keyword, *args, &block)
+          Glimmer::DataBinding::Shine.new(parent, keyword)
+        end
+      end
+    end
+  end
+end

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

@@ -19,7 +19,6 @@
 # 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'
@@ -27,14 +26,14 @@ require 'glimmer/libui/attributed_string'
 module Glimmer
   module DSL
     module Libui
-      class StringExpression < StaticExpression
+      class StringExpression < Expression
         include ParentExpression
         
         def can_interpret?(parent, keyword, *args, &block)
-          super and
+          keyword == 'string' and
             (
               parent.is_a?(Glimmer::LibUI::ControlProxy::TextProxy) or
-              parent.is_a?(Glimmer::LibUI::AttributedString)
+              (parent.is_a?(Glimmer::LibUI::AttributedString) and !args.empty?)
             )
         end
   
@@ -47,7 +46,7 @@ module Glimmer
         end
         
         def add_content(parent, keyword, *args, &block)
-          parent.post_add_content
+          parent.post_add_content(block)
         end
       end
     end