white_gold 0.0.2 → 0.0.3

data/lib/white_gold/dsl/list_box.rb

@@ -29,7 +29,7 @@ module Tgui
       def block_caller &b
         Fiddle::Closure::BlockCaller.new(0, [Fiddle::TYPE_VOIDP, Fiddle::TYPE_VOIDP]) do |str1, str2|
           id = @widget.abi_unpack_string(str2)
-          @widget.page.upon! @widget do
+          @widget.send! do
             b.(@widget.self_get_object_by_id(id), @widget)
           end
         end
@@ -55,26 +55,22 @@ module Tgui
     abi_signal :on_scroll, SignalUInt
     abi_attr :text_alignment, TextAlignment
 
-    class Item
-      def initialize list_box, id
-        @list_box = list_box
-        @id = id
-      end
+    class Item < WidgetLike
 
       def object=(object)
-        @list_box.self_objects[@id] = object
+        host.self_objects[id] = object
       end
 
       def object
-        return @list_box.self_objects[@id]
+        return host.self_objects[id]
       end
 
       def text=(text)
-        @list_box._abi_change_item_by_id @id, abi_pack_string(text)
+        host._abi_change_item_by_id id, abi_pack_string(text)
       end
 
       def remove
-        @list_box._abi_remove_item_by_id @id
+        host._abi_remove_item_by_id id
       end
     end
 
@@ -84,7 +80,7 @@ module Tgui
       _abi_add_item abi_pack_string(text), abi_pack_string(id)
       item = Item.new self, id
       na[:object] ||= object
-      upon! item, **na, &b
+      item.send! **na, &b
     end
 
     def remove_all

data/lib/white_gold/dsl/list_view.rb

@@ -31,7 +31,7 @@ module Tgui
     class ListViewItemSignal < Tgui::SignalInt
       def block_caller &b
         Fiddle::Closure::BlockCaller.new(0, [Fiddle::TYPE_INT]) do |index|
-          @widget.page.upon! @widget do
+          @widget.send! do
             b.(@widget.self_objects[index], @widget)
           end
         end
@@ -41,7 +41,7 @@ module Tgui
     class ListViewColumnSignal < Tgui::SignalInt
       def block_caller &b
         Fiddle::Closure::BlockCaller.new(0, [Fiddle::TYPE_INT]) do |index|
-          @widget.page.upon! @widget do
+          @widget.send! do
             b.(@widget.columns[index], @widget)
           end
         end
@@ -93,14 +93,14 @@ module Tgui
       index = _abi_add_column
       column = Column.new self, index
       columns << column
-      upon! column, **na, &b
+      column.send! **na, &b
     end
 
     def! :item do |object, **na, &b|
       self_add_object object, na[:index]
       item = Item.new self, object
       na.delete :index
-      upon! item, **na, &b
+      item.send! **na, &b
     end
     
     def items=(items)
@@ -173,7 +173,7 @@ module Tgui
     
     def! :grid_lines do | **na, &b|
       lines = GridLines.new self
-      upon! lines, **na, &b
+      lines.send! **na, &b
     end
 
     def grid_lines=(grid_lines)
@@ -199,7 +199,7 @@ module Tgui
 
     def! :header do |**na, &b|
       header = Header.new self
-      upon! header, **na, &b
+      header.send! **na, &b
     end
 
     def header=(header)

data/lib/white_gold/dsl/menu_bar.rb

@@ -1,4 +1,5 @@
 require_relative 'widget'
+require_relative '../convention/tree_node'
 require_relative '../convention/widget_like'
 require_relative 'signal/signal_item_hierarchy'
 
@@ -29,7 +30,7 @@ module Tgui
 
       def connect &b
         on_press = Fiddle::Closure::BlockCaller.new(0, [0]) do
-          @menu_bar.page.upon! @menu_bar do
+          @menu_bar.send! do
             b.(@path.last, @path, @menu_bar)
           end
         end
@@ -56,57 +57,13 @@ module Tgui
           end
           SignalItemHierarchy.fetch_path vector, loader
           object_path = @widget.self_object_path path
-          @widget.page.upon! @widget do
+          @widget.send! do
             b.(object_path.last, object_path, @widget)
           end
         end
       end
     end
 
-    class TreeNode
-      def initialize text
-        @text = text
-        @nodes = {}
-      end
-
-      attr_accessor :text
-      attr :nodes
-
-      def [](*path, grow: false)
-        if grow
-          path.reduce(self){|node, o| node.nodes[o] ||= TreeNode.new(nil) }
-        else
-          path.reduce(self){|node, o| node&.nodes[o] }
-        end
-      end
-
-      def cut *path, last
-        self[*path].nodes.delete last
-      end
-
-      def cut_branches *path
-        self[*path].nodes = {}
-      end
-
-      def path_str_to_object *path
-        object_path = []
-        path.reduce self do |node, str|
-          o, node = *node.nodes.find{|k, v| v.text == str }
-          object_path << o
-          node
-        end
-        object_path
-      end
-
-      def path_object_to_str *path
-        str_path = []
-        path.reduce self do |node, o|
-          node[o].tap{ str_path << _1.text }
-        end
-        str_path
-      end
-    end
-
     api_attr :self_tree do
       TreeNode.new nil
     end
@@ -122,7 +79,7 @@ module Tgui
           host._abi_add_menu_item _1, _2
         end
         item = Item.new host, item_path
-        upon! item, **na, &b
+        item.send! **na, &b
       end
 
       def! :separator do
@@ -208,7 +165,7 @@ module Tgui
       self_tree[object, grow: true].text = text
       _abi_add_menu abi_pack_string(text)
       item = Menu.new self, object
-      upon! item, **na, &b
+      item.send! **na, &b
     end
 
     def items=(items)

data/lib/white_gold/dsl/message_box.rb

@@ -37,7 +37,7 @@ module Tgui
       end
 
       def press_signal_execute
-        host.page.upon! host do
+        host.send! do
           @on_press_callbacks.each do |c|
             c.(id, self, host)
           end
@@ -52,7 +52,7 @@ module Tgui
       _abi_add_button abi_pack_string(text)
       button = Button.new self, object
       self_buttons[text] = button
-      upon! button, **na, &b
+      button.send! **na, &b
     end
 
     def [](object)

data/lib/white_gold/dsl/panel_list_box.rb

@@ -8,7 +8,7 @@ module Tgui
     class SignalPanelListBoxItem < Tgui::SignalPanelListBoxItem
       def block_caller &b
         Fiddle::Closure::BlockCaller.new(0, [Fiddle::TYPE_VOIDP]) do |id|
-          @widget.page.upon! @widget do
+          @widget.send! do
             b.(@widget.self_objects.key(@widget.abi_unpack_string(id)), @widget)
           end
         end
@@ -22,7 +22,7 @@ module Tgui
       panel = Panel.new pointer: _abi_add_item(id, abi_pack_integer(index))
       panel.page = page
       self_objects[object] = id
-      upon! panel, **na, &b
+      panel.send! **na, &b
     end
 
     def [](object)
@@ -71,7 +71,7 @@ module Tgui
     def! :template do |**na, &b|
       panel = Panel.new(pointer: _abi_get_panel_template)
       panel.page = page
-      upon! panel, **na, &b
+      panel.send! **na, &b
     end
 
     # internal

data/lib/white_gold/dsl/sfml/circle_shape.rb

@@ -0,0 +1,7 @@
+require_relative 'shape'
+
+module Tgui
+  class CircleShape < Shape
+    abi_attr :radius, Float
+  end
+end

data/lib/white_gold/dsl/sfml/convex_shape.rb

@@ -0,0 +1,15 @@
+require_relative 'shape'
+
+module Tgui
+  class ConvexShape < Shape
+    def initialized
+      @point_count = 0
+    end
+
+    def! :point do |x, y|
+      _abi_set_point_count @point_count + 1
+      _abi_set_point @point_count, *abi_pack(Vector2f, x, y)
+      @point_count += 1
+    end
+  end
+end

data/lib/white_gold/dsl/sfml/rectangle_shape.rb

@@ -0,0 +1,7 @@
+require_relative 'shape'
+
+module Tgui
+  class RectangleShape < Shape
+    abi_attr :size, Vector2f
+  end
+end

data/lib/white_gold/dsl/sfml/shape.rb

@@ -0,0 +1,19 @@
+require_relative '../../abi/extern_object'
+require_relative '../../convention/bang_nest'
+
+module Tgui
+  class Shape < ExternObject
+    include BangNest
+
+    abi_attr :texture, Texture
+    abi_attr :radius, Float
+    abi_attr :point_count, Integer
+    abi_attr :color, Color, :fill_color
+    abi_attr :border_color, Color, :outline_color
+    abi_attr :border, Float, :outline_thickness
+    abi_attr :position, Vector2f
+    abi_attr :rotation, Float
+    abi_attr :scale, Vector2f
+    abi_attr :origin, Vector2f
+  end
+end

data/lib/white_gold/dsl/sfml/text.rb

@@ -0,0 +1,22 @@
+require_relative '../../abi/extern_object'
+
+module Tgui
+  class Text < ExternObject
+    include BangNest
+
+    abi_attr :string, String
+    abi_attr :font, Font
+    abi_attr :character_size, Integer
+    abi_attr :line_spacing, Float
+    abi_attr :letter_spacing, Float
+    abi_attr :style, TextStyles
+    abi_attr :color, Color, :fill_color
+    abi_attr :border_color, Color, :outline_color
+    abi_attr :border, Float, :outline_thickness
+    abi_def :character_position, :find_character_pos, Integer => Vector2f
+    abi_attr :position, Vector2f
+    abi_attr :rotation, Float
+    abi_attr :scale, Vector2f
+    abi_attr :origin, Vector2f
+  end
+end

data/lib/white_gold/dsl/signal/global_signal.rb

@@ -6,7 +6,7 @@ module Tgui
 
     def block_caller &b
       Fiddle::Closure::BlockCaller.new(0, [0]) do
-        @widget.page.upon! @widget do
+        @widget.send! do
           b.(@widget)
         end
       end

data/lib/white_gold/dsl/signal/signal.rb

@@ -10,7 +10,7 @@ module Tgui
 
     def block_caller &b
       Fiddle::Closure::BlockCaller.new(0, [0]) do
-        @widget.page.upon! @widget do
+        @widget.send! do
           b.(@widget)
         end
       end

data/lib/white_gold/dsl/signal/signal_animation_type.rb

@@ -6,7 +6,7 @@ module Tgui
     def block_caller
       block_caller = Fiddle::Closure::BlockCaller.new(0, [Fiddle::TYPE_INT]) do |animation_type|
         at = @widget.abi_unpack AnimationType, animation_type
-        @widget.page.upon! @widget do
+        @widget.send! do
           b.(at, @widget)
         end
       end

data/lib/white_gold/dsl/signal/signal_bool.rb

@@ -6,7 +6,7 @@ module Tgui
     def block_caller &b
       Fiddle::Closure::BlockCaller.new(0, [Fiddle::TYPE_INT]) do |int|
         b = @widget.abi_unpack Boolean, int
-        @widget.page.upon! @widget do
+        @widget.send! do
           b.(b, @widget)
         end
       end

data/lib/white_gold/dsl/signal/signal_color.rb

@@ -6,7 +6,7 @@ module Tgui
     def block_caller &b
       Fiddle::Closure::BlockCaller.new(0, [Fiddle::TYPE_VOIDP]) do |ptr|
         c = @widget.abi_unpack Color, ptr
-        @widget.page.upon! @widget do
+        @widget.send! do
           b.(c, @widget)
         end
       end

data/lib/white_gold/dsl/signal/signal_float.rb

@@ -6,7 +6,7 @@ module Tgui
     def block_caller &b
       Fiddle::Closure::BlockCaller.new(0, [Fiddle::TYPE_FLOAT]) do |float|
         f = @widget.abi_unpack_float float
-        @widget.page.upon! @widget do
+        @widget.send! do
           b.(f, @widget)
         end
       end

data/lib/white_gold/dsl/signal/signal_int.rb

@@ -6,7 +6,7 @@ module Tgui
     def block_caller &b
       Fiddle::Closure::BlockCaller.new(0, [Fiddle::TYPE_VOIDP]) do |int|
         i = @widget.abi_unpack_integer int
-        @widget.page.upon! @widget do
+        @widget.send! do
           b.(i, @widget)
         end
       end

data/lib/white_gold/dsl/signal/signal_pointer.rb

@@ -5,7 +5,7 @@ module Tgui
 
     def block_caller &b
       Fiddle::Closure::BlockCaller.new(0, [Fiddle::TYPE_VOIDP]) do |pointer|
-        @widget.page.upon! @widget do
+        @widget.send! do
           b.(pointer, @widget)
         end
       end

data/lib/white_gold/dsl/signal/signal_range.rb

@@ -5,7 +5,7 @@ module Tgui
 
     def block_caller &b
       Fiddle::Closure::BlockCaller.new(0, [Fiddle::TYPE_FLOAT, Fiddle::TYPE_FLOAT]) do |min, max|
-        @widget.page.upon! @widget do
+        @widget.send! do
           b.(min..max, @widget)
         end
       end

data/lib/white_gold/dsl/signal/signal_show_effect.rb

@@ -7,7 +7,7 @@ module Tgui
       Fiddle::Closure::BlockCaller.new(0, [Fiddle::TYPE_INT, Fiddle::TYPE_INT]) do |show_effect_type, shown|
         effect_type = @widget.abi_unpack ShowEffectType, show_effect_type
         shown = @widget.abi_unpack Boolean, shown
-        @widget.page.upon! @widget do
+        @widget.send! do
           b.(effect_type, shown, @widget)
         end
       end

data/lib/white_gold/dsl/signal/signal_string.rb

@@ -6,7 +6,7 @@ module Tgui
     def block_caller &b
       Fiddle::Closure::BlockCaller.new(0, [Fiddle::TYPE_VOIDP]) do |str|
         string = @widget.abi_unpack_string(str)
-        @widget.page.upon! @widget do
+        @widget.send! do
           b.(string, @widget)
         end
       end

data/lib/white_gold/dsl/signal/signal_u_int.rb

@@ -6,7 +6,7 @@ module Tgui
     def block_caller &b
       Fiddle::Closure::BlockCaller.new(0, [Fiddle::TYPE_INT]) do |uint|
         int = @widget.abi_unpack Integer, uint
-        @widget.page.upon! @widget do
+        @widget.send! do
           b.(int, @widget)
         end
       end

data/lib/white_gold/dsl/signal/signal_vector2f.rb

@@ -5,7 +5,7 @@ module Tgui
     def block_caller &b
       Fiddle::Closure::BlockCaller.new(0, [Fiddle::TYPE_VOIDP]) do |ptr|
         vector = @widget.abi_unpack Vector2f, ptr
-        @widget.page.upon! @widget do
+        @widget.send! do
           b.(vector, @widget)
         end
       end

data/lib/white_gold/dsl/tab_container.rb

@@ -75,7 +75,7 @@ module Tgui
       objects.insert index, object
       tab_panel = TabPanel.new self, index, panel_pointer
       tab_panel.page = page
-      upon! tab_panel, **na, &b
+      tab_panel.send! **na, &b
     end
     
     def [](object)
@@ -93,7 +93,7 @@ module Tgui
     def! :tabs do |**na, &b|
       tabs = Tabs.new self, _abi_get_tabs
       tabs.page = page
-      upon! tabs, **na, &b
+      tabs.send! **na, &b
     end
 
     def remove object

data/lib/white_gold/dsl/tabs.rb

@@ -61,7 +61,7 @@ module Tgui
       end
       objects.insert index, object
       tab = Tab.new self, index
-      upon! tab, **na, &b
+      tab.send! **na, &b
     end
 
     def remove object
@@ -101,7 +101,7 @@ module Tgui
 
       def block_caller &b
         Fiddle::Closure::BlockCaller.new(0, [0]) do
-          @widget.page.upon! @widget do
+          @widget.send! do
             b.(@widget.selected, @widget)
           end
         end

data/lib/white_gold/dsl/theme.rb

@@ -70,7 +70,7 @@ module Tgui
       self.next_renderer_id = renderer_id = next_renderer_id.next
       attribute = type.new(seed, renderer_id)
       attributes[attribute.name] = attribute
-      upon! attribute, **na, &b
+      attribute.send! **na, &b
       self_commit
       renderer_id
     end

data/lib/white_gold/dsl/tree_view.rb

@@ -1,4 +1,5 @@
 require_relative 'widget'
+require_relative '../convention/tree_node'
 require_relative 'signal/signal_item_hierarchy'
 
 module Tgui
@@ -32,42 +33,14 @@ module Tgui
             path << @widget.abi_unpack_string(str)
           end
           SignalItemHierarchy.fetch_path vector, loader
-          object_path = @widget.self_tree.path_str_to_object path
-          @widget.page.upon! @widget do
+          object_path = @widget.self_tree.path_str_to_object *path
+          @widget.send! do
             b.(object_path.last, object_path, @widget)
           end
         end
       end
     end
 
-    class TreeNode
-      def initialize object
-        @object = object
-        @nodes = {}
-      end
-
-      attr_accessor :object
-      attr :nodes
-
-      def [](*path, grow: false)
-        if grow
-          path.reduce(self){|node, str| node.nodes[str] ||= TreeNode.new nil }
-        else
-          path.reduce(self){|node, str| node&.nodes[str] }
-        end
-      end
-
-      def cut *path, last
-        self[*path].nodes.delete last
-      end
-
-      def path_str_to_object path
-        objects = []
-        path.reduce(self){|node, str| node[str].tap{|n| objects << n.object } }
-        objects
-      end
-    end
-
     api_attr :self_tree do
       TreeNode.new nil
     end
@@ -121,6 +94,14 @@ module Tgui
         Item.new host, [*path, *path_end]
       end
 
+      def text=(text)
+        host.self_change_item path, text
+      end
+
+      def text
+        host.self_tree[*path].text
+      end
+
       def object
         path.last
       end
@@ -192,15 +173,22 @@ module Tgui
       new_path = [*path, object]
       self_path_block new_path do
         _abi_add_item _1, _2, abi_pack_boolean(true)
-        self_tree[*_3, grow: true].object = object
+        self_tree[*new_path, grow: true].text = _3
       end
       item = Item.new self, new_path
-      upon! item, **na, &b
+      item.send! **na, &b
+    end
+
+    def self_change_item path, text, **na, &b
+      self_path_block path do
+        _abi_change_item _1, _2, text
+        self_tree[*path].text = text
+      end
     end
 
     def self_path_block path, &b
       path = path.map(&format)
-      b.(*abi_pack(String.., *path), path)
+      b.(*abi_pack(String.., *path), path.last)
     end
   end
 end