glimmer-dsl-libui 0.0.15 → 0.0.19

data/examples/form.rb

@@ -10,13 +10,11 @@ window('Form') { |w|
   vertical_box {
     form {
       @first_name_entry = entry {
-        # stretchy true # Smart default option for appending to form
-        label 'First Name'
+        label 'First Name' # label property is available when control is nested under form
       }
       
       @last_name_entry = entry {
-        # stretchy true # Smart default option for appending to form
-        label 'Last Name'
+        label 'Last Name' # label property is available when control is nested under form
       }
     }
     

data/examples/grid.rb

@@ -8,8 +8,8 @@ window('Grid') {
   tab {
     tab_item('Spanning') {
       grid {
-        4.times { |left_value|
-          4.times { |top_value|
+        4.times { |top_value|
+          4.times { |left_value|
             label("(#{left_value}, #{top_value}) xspan1\nyspan1") {
               left left_value
               top top_value

data/lib/glimmer/libui/box.rb

@@ -42,7 +42,7 @@ module Glimmer
       
       def destroy_child(child)
         ::LibUI.send("box_delete", @libui, children.index(child))
-        ControlProxy.all_control_proxies.delete(child)
+        ControlProxy.control_proxies.delete(child)
       end
       
       private

data/lib/glimmer/libui/button_proxy.rb

@@ -0,0 +1,41 @@
+# 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'
+
+module Glimmer
+  module LibUI
+    # Proxy for LibUI button objects
+    #
+    # Follows the Proxy Design Pattern
+    class ButtonProxy < ControlProxy
+      DEFAULT_TEXT = ''
+      
+      private
+      
+      def build_control
+        construction_args = @args.dup
+        construction_args[0] = DEFAULT_TEXT if construction_args.size == 0
+        @libui = ControlProxy.new_control(@keyword, construction_args)
+      end
+    end
+  end
+end

data/lib/glimmer/libui/checkbox_proxy.rb

@@ -0,0 +1,41 @@
+# 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'
+
+module Glimmer
+  module LibUI
+    # Proxy for LibUI checkbox objects
+    #
+    # Follows the Proxy Design Pattern
+    class CheckboxProxy < ControlProxy
+      DEFAULT_TEXT = ''
+      
+      private
+      
+      def build_control
+        construction_args = @args.dup
+        construction_args[0] = DEFAULT_TEXT if construction_args.size == 0
+        @libui = ControlProxy.new_control(@keyword, construction_args)
+      end
+    end
+  end
+end

data/lib/glimmer/libui/column.rb

@@ -0,0 +1,55 @@
+# 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'
+
+module Glimmer
+  module LibUI
+    # Common logic for all column proxy objects
+    module Column
+      attr_reader :appended
+      alias appended? appended
+    
+      def initialize(keyword, parent, args, &block)
+        @keyword = keyword
+        @parent_proxy = parent
+        @args = args
+        @block = block
+        @enabled = true
+        post_add_content if @block.nil?
+      end
+      
+      def name
+        @args.first
+      end
+      
+      private
+      
+      def build_control
+        @appended = true
+      end
+      
+      def next_column_index
+        @parent_proxy.columns.map(&:appended?).compact.count
+      end
+    end
+  end
+end

data/lib/glimmer/libui/control_proxy.rb

@@ -33,7 +33,7 @@ module Glimmer
         end
         
         def create(keyword, parent, args, &block)
-          widget_proxy_class(keyword).new(keyword, parent, args, &block).tap {|c| all_control_proxies << c}
+          widget_proxy_class(keyword).new(keyword, parent, args, &block).tap {|c| control_proxies << c}
         end
         
         def widget_proxy_class(keyword)
@@ -46,13 +46,13 @@ module Glimmer
         end
         
         # autosave all controls in this array to avoid garbage collection
-        def all_control_proxies
-          @@all_control_proxies = [] unless defined?(@@all_control_proxies)
-          @@all_control_proxies
+        def control_proxies
+          @@control_proxies = [] unless defined?(@@control_proxies)
+          @@control_proxies
         end
         
         def main_window_proxy
-          all_control_proxies.find {|c| c.is_a?(Glimmer::LibUI::WindowProxy)}
+          control_proxies.find {|c| c.is_a?(Glimmer::LibUI::WindowProxy)}
         end
         
         def integer_to_boolean(int)
@@ -64,7 +64,15 @@ module Glimmer
         end
         
         def menu_proxies
-          all_control_proxies.select {|c| c.keyword == 'menu' }
+          control_proxies.select {|c| c.keyword == 'menu' }
+        end
+        
+        def image_proxies
+          control_proxies.select {|c| c.keyword == 'image' }
+        end
+        
+        def new_control(keyword, args)
+          ::LibUI.send("new_#{keyword}", *args)
         end
       end
       
@@ -216,7 +224,7 @@ module Glimmer
       
       def default_destroy
         send_to_libui('destroy')
-        ControlProxy.all_control_proxies.delete(self)
+        ControlProxy.control_proxies.delete(self)
       end
             
       def enabled(value = nil)
@@ -254,7 +262,7 @@ module Glimmer
       
       def build_control
         @libui = if ::LibUI.respond_to?("new_#{keyword}")
-          ::LibUI.send("new_#{@keyword}", *@args)
+          ControlProxy.new_control(@keyword, @args)
         elsif ::LibUI.respond_to?(keyword)
           @args[0] = @args.first.libui if @args.first.is_a?(ControlProxy)
           ::LibUI.send(@keyword, *@args)

data/lib/glimmer/libui/form_proxy.rb

@@ -39,7 +39,7 @@ module Glimmer
       
       def destroy_child(child)
         ::LibUI.send("form_delete", @libui, children.index(child))
-        ControlProxy.all_control_proxies.delete(child)
+        ControlProxy.control_proxies.delete(child)
       end
       
       private

data/lib/glimmer/libui/group_proxy.rb

@@ -27,6 +27,8 @@ module Glimmer
     #
     # Follows the Proxy Design Pattern
     class GroupProxy < ControlProxy
+      DEFAULT_TITLE = ''
+      
       def post_initialize_child(child)
         ::LibUI.group_set_child(@libui, child.libui)
       end
@@ -39,7 +41,10 @@ module Glimmer
       private
       
       def build_control
-        super.tap do
+        construction_args = @args.dup
+        construction_args[0] = DEFAULT_TITLE if construction_args.size == 0
+        @libui = ControlProxy.new_control(@keyword, construction_args)
+        @libui.tap do
           self.margined = true
         end
       end

data/lib/glimmer/libui/image_column_proxy.rb

@@ -0,0 +1,41 @@
+# 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/column'
+
+module Glimmer
+  module LibUI
+    # Proxy for LibUI image column objects
+    #
+    # Follows the Proxy Design Pattern
+    class ImageColumnProxy < ControlProxy
+      include Column
+    
+      private
+      
+      def build_control
+        @parent_proxy.append_image_column(name, next_column_index)
+        super
+      end
+    end
+  end
+end

data/lib/glimmer/libui/image_part_proxy.rb

@@ -0,0 +1,37 @@
+# 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'
+
+module Glimmer
+  module LibUI
+    # Proxy for LibUI image part objects
+    #
+    # Follows the Proxy Design Pattern
+    class ImagePartProxy < ControlProxy
+      private
+      
+      def build_control
+        @libui = @parent_proxy.append(*@args)
+      end
+    end
+  end
+end

data/lib/glimmer/libui/label_proxy.rb

@@ -0,0 +1,41 @@
+# 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'
+
+module Glimmer
+  module LibUI
+    # Proxy for LibUI label objects
+    #
+    # Follows the Proxy Design Pattern
+    class LabelProxy < ControlProxy
+      DEFAULT_TEXT = ''
+      
+      private
+      
+      def build_control
+        construction_args = @args.dup
+        construction_args[0] = DEFAULT_TEXT if construction_args.size == 0
+        @libui = ControlProxy.new_control(@keyword, construction_args)
+      end
+    end
+  end
+end

data/lib/glimmer/libui/menu_proxy.rb

@@ -0,0 +1,41 @@
+# 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'
+
+module Glimmer
+  module LibUI
+    # Proxy for LibUI menu objects
+    #
+    # Follows the Proxy Design Pattern
+    class MenuProxy < ControlProxy
+      DEFAULT_TEXT = ''
+      
+      private
+      
+      def build_control
+        construction_args = @args.dup
+        construction_args[0] = DEFAULT_TEXT if construction_args.size == 0
+        @libui = ControlProxy.new_control(@keyword, construction_args)
+      end
+    end
+  end
+end

data/lib/glimmer/libui/table_proxy.rb

@@ -0,0 +1,138 @@
+# 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'
+
+module Glimmer
+  module LibUI
+    # Proxy for LibUI table objects
+    #
+    # Follows the Proxy Design Pattern
+    class TableProxy < ControlProxy
+      attr_reader :model_handler, :model, :table_params, :columns
+    
+      def initialize(keyword, parent, args, &block)
+        @keyword = keyword
+        @parent_proxy = parent
+        @args = args
+        @block = block
+        @enabled = true
+        @columns = []
+        @cell_rows = []
+        window_proxy.on_destroy do
+          # the following unless condition is an exceptional condition stumbled upon that fails freeing the table model
+          ::LibUI.free_table_model(@model) unless @destroyed && parent_proxy.is_a?(Glimmer::LibUI::Box)
+        end
+      end
+      
+      def post_add_content
+        build_control
+        super
+      end
+      
+      def post_initialize_child(child)
+        @columns << child
+      end
+      
+      def destroy
+        super
+        @destroyed = true
+      end
+      
+      def cell_rows(rows = nil)
+        if rows.nil?
+          @cell_rows
+        else
+          rows = rows.map {|row| row.map {|cell| cell.respond_to?(:libui) ? cell.libui : cell }}
+          @cell_rows = rows
+        end
+      end
+      alias cell_rows= cell_rows
+      alias set_cell_rows cell_rows
+      
+      def editable(value = nil)
+        if value.nil?
+          @editable
+        else
+          @editable = !!value
+        end
+      end
+      alias editable= editable
+      alias set_editable editable
+      alias editable? editable
+      
+      private
+      
+      def build_control
+        @model_handler = ::LibUI::FFI::TableModelHandler.malloc
+        @model_handler.NumColumns   = rbcallback(4) { @columns.count }
+        @model_handler.ColumnType   = rbcallback(4) do
+          # Note: this assumes all columns are the same type
+          # TODO support different values per different columns
+          case @columns.first
+          when TextColumnProxy
+            0
+          when ImageColumnProxy
+            1
+          end
+        end
+        @model_handler.NumRows      = rbcallback(4) { cell_rows.count }
+        @model_handler.CellValue    = rbcallback(1, [1, 1, 4, 4]) do |_, _, row, column|
+          case @columns[column]
+          when TextColumnProxy
+            ::LibUI.new_table_value_string((@cell_rows[row] && @cell_rows[row][column]).to_s)
+          when ImageColumnProxy
+            ::LibUI.new_table_value_image((@cell_rows[row] && @cell_rows[row][column]))
+          end
+        end
+        @model_handler.SetCellValue = rbcallback(0, [1, 1, 4, 4, 1]) do |_, _, row, column, val|
+          case @columns[column]
+          when TextColumnProxy
+            @cell_rows[row] ||= []
+            @cell_rows[row][column] = ::LibUI.table_value_string(val).to_s
+          end
+        end
+        
+        @model = ::LibUI.new_table_model(@model_handler)
+        
+        @table_params = ::LibUI::FFI::TableParams.malloc
+        @table_params.Model = @model
+        @table_params.RowBackgroundColorModelColumn = -1
+        
+        @libui = ControlProxy.new_control(@keyword, [@table_params])
+        @libui.tap do
+          @columns.each {|column| column.send(:build_control) }
+        end
+      end
+      
+      def rbcallback(*args, &block)
+        # TODO consider moving to a more general reusable location in the future (e.g. when used with `AreaProxy`)
+        # Protects BlockCaller objects from garbage collection.
+        @blockcaller ||= []
+        args << [0] if args.size == 1 # Argument types are ommited
+        blockcaller = Fiddle::Closure::BlockCaller.new(*args, &block)
+        @blockcaller << blockcaller
+        blockcaller
+      end
+      
+    end
+  end
+end

data/lib/glimmer/libui/text_column_proxy.rb

@@ -0,0 +1,41 @@
+# 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/column'
+
+module Glimmer
+  module LibUI
+    # Proxy for LibUI text column objects
+    #
+    # Follows the Proxy Design Pattern
+    class TextColumnProxy < ControlProxy
+      include Column
+          
+      private
+      
+      def build_control
+        @parent_proxy.append_text_column(name, next_column_index, @parent_proxy.editable? ? -2 : -1)
+        super
+      end
+    end
+  end
+end

data/lib/glimmer/libui/window_proxy.rb

@@ -27,7 +27,7 @@ module Glimmer
     #
     # Follows the Proxy Design Pattern
     class WindowProxy < ControlProxy
-      DEFAULT_TITLE = 'Glimmer'
+      DEFAULT_TITLE = ''
       DEFAULT_WIDTH = 150
       DEFAULT_HEIGHT = 150
       DEFAULT_HAS_MENUBAR = 1
@@ -40,6 +40,17 @@ module Glimmer
         ::LibUI.send("window_set_child", @libui, nil)
         super
       end
+      
+      def destroy
+        super
+        ControlProxy.image_proxies.each { |image_proxy| ::LibUI.free_image(image_proxy.libui) }
+        @on_destroy_procs&.each { |on_destroy_proc| on_destroy_proc.call(self)}
+      end
+      
+      def on_destroy(&block)
+        @on_destroy_procs ||= []
+        @on_destroy_procs << block
+      end
     
       def show
         super
@@ -79,7 +90,7 @@ module Glimmer
         construction_args[2] = DEFAULT_HEIGHT if construction_args.size == 2
         construction_args[3] = DEFAULT_HAS_MENUBAR if construction_args.size == 3
         construction_args[3] = ControlProxy.boolean_to_integer(construction_args[3]) if construction_args.size == 4 && (construction_args[3].is_a?(TrueClass) || construction_args[3].is_a?(FalseClass))
-        @libui = ::LibUI.send("new_window", *construction_args)
+        @libui = ControlProxy.new_control(@keyword, construction_args)
         @libui.tap do
           handle_listener('on_closing') do
             destroy