glimmer-dsl-libui 0.2.1 → 0.2.5

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

@@ -60,7 +60,18 @@ module Glimmer
         end
         
         def post_add_content
-          super
+          unless parent_proxy.is_a?(Box)
+            original_parent_proxy = @parent_proxy
+            @vertical_box_parent_proxy = ControlProxy.create('vertical_box', parent_proxy, []) {} # block prevents calling post add content
+            append_properties.each do |property|
+              @vertical_box_parent_proxy.append_property(property, append_property(property))
+            end
+            @vertical_box_parent_proxy.post_add_content
+            @parent_proxy = @vertical_box_parent_proxy
+            @vertical_box_parent_proxy.post_initialize_child(self)
+          else
+            super
+          end
           install_listeners
         end
         
@@ -72,7 +83,7 @@ module Glimmer
         def redraw
           queue_redraw_all
         end
-        
+          
         private
         
         def build_control
@@ -169,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/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
@@ -52,6 +51,8 @@ module Glimmer
             ::LibUI.color_button_set_color(@libui, value[:r].to_f / 255.0, value[:g].to_f / 255.0, value[:b].to_f / 255.0, value[:a])
           end
         end
+        alias color= color
+        alias set_color color
         
         def red(value = nil)
           if value.nil?

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/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,172 @@
+# 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)
+          reset_attributed_string
+          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[:area_width])
+          else
+            @width = value
+            redraw
+          end
+        end
+        alias width= width
+        alias set_width width
+        
+        def 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 ||= {
+              family: 'Helvetica',
+              size: 12.0,
+              weight: :normal,
+              italic: :normal,
+              stretch: :normal,
+            }
+          else
+            @default_font = value
+            redraw
+          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
+            redraw
+          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: :left)
+          @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/control_proxy/window_proxy.rb

@@ -35,12 +35,6 @@ module Glimmer
         DEFAULT_HAS_MENUBAR = 1
         
         def post_initialize_child(child)
-          if child.is_a?(AreaProxy)
-            vertical_box_parent = ControlProxy.create('vertical_box', self, [])
-            child.instance_variable_set(:@parent_proxy, vertical_box_parent)
-            vertical_box_parent.post_initialize_child(child)
-            child = vertical_box_parent
-          end
           ::LibUI.window_set_child(@libui, child.libui)
         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.to_s.to_sym]
+        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.1
+  version: 0.2.5
 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,8 @@ files:
 - examples/basic_area.rb
 - 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
@@ -229,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
@@ -254,9 +258,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 +316,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