glimmer-dsl-libui 0.2.17 → 0.2.21

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

@@ -109,6 +109,31 @@ module Glimmer
           queue_redraw_all
         end
           
+        def request_auto_redraw
+          # TODO implement functionality to delay queuing area redraws until post_add_content has been called (area definition is done). Maybe offer an option to enable redrawing before area is closed too.
+          queue_redraw_all if auto_redraw_enabled?
+        end
+        
+        def auto_redraw_enabled(value = nil)
+          if value.nil?
+            @auto_redraw_enabled = true if @auto_redraw_enabled.nil?
+            @auto_redraw_enabled
+          else
+            @auto_redraw_enabled = !!value
+          end
+        end
+        alias auto_redraw_enabled? auto_redraw_enabled
+        alias auto_redraw_enabled= auto_redraw_enabled
+        alias set_auto_redraw_enabled auto_redraw_enabled
+        
+        def pause_auto_redraw
+          self.auto_redraw_enabled = false
+        end
+          
+        def resume_auto_redraw
+          self.auto_redraw_enabled = true
+        end
+        
         private
         
         def build_control

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

@@ -68,12 +68,16 @@ module Glimmer
           if args.empty?
             @fill ||= {}
           else
-            @fill = Glimmer::LibUI.interpret_color(args)
-            @parent_proxy&.queue_redraw_all
+            new_color = Glimmer::LibUI.interpret_color(args)
+            if new_color != @fill
+              @fill_observer&.unobserve(@fill) if @fill
+              @fill = new_color
+              request_auto_redraw
+            end
           end
           @fill.tap do
             @fill_observer ||= Glimmer::DataBinding::Observer.proc do
-              @parent_proxy&.queue_redraw_all
+              request_auto_redraw
             end
             @fill_observer.observe(@fill)
           end
@@ -92,12 +96,16 @@ module Glimmer
           if args.empty?
             @stroke ||= {}
           else
-            @stroke = Glimmer::LibUI.interpret_color(args)
-            @parent_proxy&.queue_redraw_all
+            new_color = Glimmer::LibUI.interpret_color(args)
+            if new_color != @stroke
+              @stroke_observer&.unobserve(@stroke) if @stroke
+              @stroke = Glimmer::LibUI.interpret_color(args)
+              request_auto_redraw
+            end
           end
           @stroke.tap do
             @stroke_observer ||= Glimmer::DataBinding::Observer.proc do
-              @parent_proxy&.queue_redraw_all
+              request_auto_redraw
             end
             @stroke_observer.observe(@stroke)
           end
@@ -137,7 +145,11 @@ module Glimmer
         end
         
         def redraw
-          @parent_proxy&.queue_redraw_all
+          @parent_proxy&.redraw
+        end
+        
+        def request_auto_redraw
+          @parent_proxy&.request_auto_redraw
         end
         
         private

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

@@ -78,6 +78,7 @@ module Glimmer
           when 'on_destroy'
             on_destroy(&listener)
           else
+            default_behavior_listener = nil
             if listener_name == 'on_closing'
               default_behavior_listener = Proc.new do
                 return_value = listener.call(self)
@@ -90,9 +91,45 @@ module Glimmer
                 end
               end
             end
-            super(listener_name, &default_behavior_listener)
+            super(listener_name, &(default_behavior_listener || listener))
           end
         end
+        
+        def content_size(*args)
+          if args.empty?
+            width = Fiddle::Pointer.malloc(8)
+            height = Fiddle::Pointer.malloc(8)
+            ::LibUI.window_content_size(@libui, width, height)
+            width = width[0, 8].unpack1('i')
+            height = height[0, 8].unpack1('i')
+            [width, height]
+          else
+            args = args.first if args.size == 1 && args.first.is_a?(Array)
+            super
+            @width = args[0]
+            @height = args[1]
+          end
+        end
+        alias content_size= content_size
+        alias set_content_size content_size
+        
+        def resizable(value = nil)
+          if value.nil?
+            @resizable = true if @resizable.nil?
+            @resizable
+          else
+            @resizable = value
+            if !@resizable && !@resizable_listener_registered
+              handle_listener('on_content_size_changed') do
+                set_content_size(@width, @height) unless @resizable
+              end
+              @resizable_listener_registered = true
+            end
+          end
+        end
+        alias resizable? resizable
+        alias resizable= resizable
+        alias set_resizable resizable
       
         private
         
@@ -107,6 +144,8 @@ 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] = Glimmer::LibUI.boolean_to_integer(construction_args[3]) if construction_args.size == 4 && (construction_args[3].is_a?(TrueClass) || construction_args[3].is_a?(FalseClass))
+          @width = construction_args[1]
+          @height = construction_args[2]
           @libui = ControlProxy.new_control(@keyword, construction_args)
           @libui.tap do
             handle_listener('on_closing') do

data/lib/glimmer/libui/shape/figure.rb

@@ -41,8 +41,10 @@ module Glimmer
           if value.nil?
             @closed
           else
-            @closed = value
-            area_proxy&.queue_redraw_all
+            if !!value != !!@closed
+              @closed = value
+              request_auto_redraw
+            end
           end
         end
         alias closed= closed

data/lib/glimmer/libui/shape/polybezier.rb

@@ -0,0 +1,45 @@
+# 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/shape'
+
+module Glimmer
+  module LibUI
+    class Shape
+      class Polybezier < Shape
+        parameters :point_array
+        parameter_defaults []
+      
+        def draw(area_draw_params)
+          alternating_x_y_array = point_array.to_a.compact.flatten
+          unless alternating_x_y_array.empty?
+            ::LibUI.draw_path_new_figure(path_proxy.libui, alternating_x_y_array[0], alternating_x_y_array[1])
+            ((alternating_x_y_array.size - 2) / 6).times do |n|
+              point_alternating_x_y_index = n * 6
+              ::LibUI.draw_path_bezier_to(path_proxy.libui, alternating_x_y_array[point_alternating_x_y_index + 2], alternating_x_y_array[point_alternating_x_y_index + 3], alternating_x_y_array[point_alternating_x_y_index + 4], alternating_x_y_array[point_alternating_x_y_index + 5], alternating_x_y_array[point_alternating_x_y_index + 6], alternating_x_y_array[point_alternating_x_y_index + 7])
+            end
+          end
+          super
+        end
+      end
+    end
+  end
+end

data/lib/glimmer/libui/shape/polygon.rb

@@ -0,0 +1,46 @@
+# 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/shape'
+
+module Glimmer
+  module LibUI
+    class Shape
+      class Polygon < Shape
+        parameters :point_array
+        parameter_defaults []
+      
+        def draw(area_draw_params)
+          alternating_x_y_array = point_array.to_a.compact.flatten
+          unless alternating_x_y_array.empty?
+            ::LibUI.draw_path_new_figure(path_proxy.libui, alternating_x_y_array[0], alternating_x_y_array[1])
+            ((alternating_x_y_array.size - 2) / 2).times do |n|
+              point_alternating_x_y_index = n * 2
+              ::LibUI.draw_path_line_to(path_proxy.libui, alternating_x_y_array[point_alternating_x_y_index + 2], alternating_x_y_array[point_alternating_x_y_index + 3])
+            end
+            ::LibUI.draw_path_close_figure(path_proxy.libui)
+          end
+          super
+        end
+      end
+    end
+  end
+end

data/lib/glimmer/libui/shape/polyline.rb

@@ -0,0 +1,45 @@
+# 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/shape'
+
+module Glimmer
+  module LibUI
+    class Shape
+      class Polyline < Shape
+        parameters :point_array
+        parameter_defaults []
+      
+        def draw(area_draw_params)
+          alternating_x_y_array = point_array.to_a.compact.flatten
+          unless alternating_x_y_array.empty?
+            ::LibUI.draw_path_new_figure(path_proxy.libui, alternating_x_y_array[0], alternating_x_y_array[1])
+            ((alternating_x_y_array.size - 2) / 2).times do |n|
+              point_alternating_x_y_index = n * 2
+              ::LibUI.draw_path_line_to(path_proxy.libui, alternating_x_y_array[point_alternating_x_y_index + 2], alternating_x_y_array[point_alternating_x_y_index + 3])
+            end
+          end
+          super
+        end
+      end
+    end
+  end
+end

data/lib/glimmer/libui/shape.rb

@@ -87,7 +87,11 @@ module Glimmer
       end
       
       def redraw
-        area_proxy&.queue_redraw_all
+        area_proxy&.auto_redraw
+      end
+      
+      def request_auto_redraw
+        area_proxy&.request_auto_redraw
       end
       
       def destroy
@@ -113,8 +117,10 @@ module Glimmer
           method_name = method_name.to_s
           parameter_index = self.class.parameters.index(method_name_parameter)
           if method_name.start_with?('set_') || method_name.end_with?('=') || !args.empty?
-            @args[parameter_index] = args.first
-            area_proxy&.queue_redraw_all
+            if args.first != @args[parameter_index]
+              @args[parameter_index] = args.first
+              request_auto_redraw
+            end
           else
             @args[parameter_index]
           end

data/lib/glimmer/libui.rb

@@ -100,11 +100,39 @@ module Glimmer
         enum_symbol_values(enum_name).keys
       end
       
+      def enum_names
+       [
+         :align,
+         :at,
+         :attribute_type,
+         :draw_brush_type,
+         :draw_fill_mode,
+         :draw_line_cap,
+         :draw_line_join,
+         :draw_text_align,
+         :ext_key,
+         :modifier,
+         :table_model_column,
+         :table_value_type,
+         :text_italic,
+         :text_stretch,
+         :text_weight,
+         :underline,
+         :underline_color
+       ]
+      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, ::LibUI.const_get(c)] }.to_h
+        @enum_symbols[enum_name] ||= ::LibUI.constants.select do |c|
+          c.to_s.match(/#{enum_name.to_s.camelcase(:upper)}[A-Z]/)
+        end.map do |c|
+          [c.to_s.underscore.sub("#{enum_name}_", '').to_sym, ::LibUI.const_get(c)]
+        end.reject do |key, value|
+          enum_name == :underline && key.to_s.start_with?('color')
+        end.to_h
       end
       
       def enum_value_to_symbol(enum_name, enum_value)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-libui
 version: !ruby/object:Gem::Version
-  version: 0.2.17
+  version: 0.2.21
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-03 00:00:00.000000000 Z
+date: 2021-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glimmer
@@ -257,6 +257,9 @@ files:
 - examples/tetris/model/game.rb
 - examples/tetris/model/past_game.rb
 - examples/tetris/model/tetromino.rb
+- examples/tic_tac_toe.rb
+- examples/tic_tac_toe/board.rb
+- examples/tic_tac_toe/cell.rb
 - examples/timer.rb
 - glimmer-dsl-libui.gemspec
 - icons/glimmer.png
@@ -344,6 +347,9 @@ files:
 - lib/glimmer/libui/shape/circle.rb
 - lib/glimmer/libui/shape/figure.rb
 - lib/glimmer/libui/shape/line.rb
+- lib/glimmer/libui/shape/polybezier.rb
+- lib/glimmer/libui/shape/polygon.rb
+- lib/glimmer/libui/shape/polyline.rb
 - lib/glimmer/libui/shape/rectangle.rb
 - lib/glimmer/libui/shape/square.rb
 - sounds/AlanWalker-Faded.mid