glimmer-dsl-libui 0.2.15 → 0.2.19

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/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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-libui
 version: !ruby/object:Gem::Version
-  version: 0.2.15
+  version: 0.2.19
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-28 00:00:00.000000000 Z
+date: 2021-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glimmer
@@ -252,6 +252,11 @@ files:
 - examples/method_based_custom_keyword.rb
 - examples/midi_player.rb
 - examples/simple_notepad.rb
+- examples/tetris.rb
+- examples/tetris/model/block.rb
+- examples/tetris/model/game.rb
+- examples/tetris/model/past_game.rb
+- examples/tetris/model/tetromino.rb
 - examples/timer.rb
 - glimmer-dsl-libui.gemspec
 - icons/glimmer.png
@@ -339,6 +344,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