white_gold 0.0.1 → 0.0.3

data/lib/white_gold/dsl/tree_view.rb

@@ -1,9 +1,30 @@
 require_relative 'widget'
+require_relative '../convention/tree_node'
 require_relative 'signal/signal_item_hierarchy'
 
 module Tgui
   class TreeView < Widget
 
+    class Theme < Widget::Theme
+      theme_attr :borders, :outline
+      theme_attr :padding, :outline
+      theme_attr :background_color, :color
+      theme_attr :background_color_hover, :color
+      theme_attr :selected_background_color, :color
+      theme_attr :selected_background_color_hover, :color
+      theme_attr :border_color, :color
+      theme_attr :text_color, :color
+      theme_attr :text_color_hover, :color
+      theme_attr :selected_text_color, :color
+      theme_attr :selected_text_color_hover, :color
+      theme_comp :scrollbar, Scrollbar::Theme
+      theme_attr :scrollbar_width, :float
+      theme_attr :texture_background, :texture
+      theme_attr :texture_branch_expanded, :texture
+      theme_attr :texture_branch_collapsed, :texture
+      theme_attr :texture_leaf, :texture
+    end
+
     class SignalItemHierarchy < Tgui::SignalItemHierarchy
       def block_caller &b
         Fiddle::Closure::BlockCaller.new(0, [Fiddle::TYPE_VOIDP]) do |vector|
@@ -12,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
@@ -101,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
@@ -172,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

data/lib/white_gold/dsl/widget.rb

@@ -1,9 +1,9 @@
 require_relative '../abi/extern_object'
-require_relative '../convention/bang_nested_caller'
+require_relative '../convention/bang_nest'
 require_relative '../convention/unit'
 require_relative '../convention/widget_like'
 require_relative '../convention/api_child'
-require_relative 'theme/widget_theme'
+require_relative '../convention/theme/theme_component'
 require_relative 'color'
 require_relative 'outline'
 require_relative 'texture'
@@ -15,15 +15,20 @@ require_relative 'tool_tip'
 
 module Tgui
   class Widget < ExternObject
-    include BangNestedCaller
+    include BangNest
     extend BangDef
 
-    attr_accessor :page
-
-    def window
-      page.window
+    class Theme < ThemeComponent
+    
+      theme_attr :opacity, :float
+      theme_attr :opacity_disabled, :float
+      theme_attr :text_size, :float
+      theme_attr :transparent_texture, :boolean
+  
     end
 
+    attr_accessor :page
+
     abi_attr :text_size, Integer
     abi_attr :enabled?
 
@@ -31,16 +36,10 @@ module Tgui
       self.enabled = !disabled
     end
 
-    def theme_comp
-      :widget
-    end
-
     def! :renderer do |seed = VOID, **na, &b|
       seed = page.custom_renderers[self] if seed == VOID
       if !na.empty? || b
-        upon! page.theme do
-          seed = custom! theme_comp, seed, **na, &b
-        end
+        seed = page.theme.custom! self.class::Theme, seed, **na, &b
         page.custom_renderers[self] = seed
       elsif !seed
         page.custom_renderers.delete self
@@ -90,6 +89,9 @@ module Tgui
       size[0]
     end
 
+    abi_enum "AutoLayout", :disabled, :top, :left, :right, :bottom, :leftmost, :rightmost, :fill
+
+    abi_attr :auto_layout, AutoLayout
     abi_def :can_gain_focus?, :can_gain_focus, nil => Boolean
     abi_def :container?, nil => Boolean
 
@@ -97,7 +99,7 @@ module Tgui
       if block_given?
         tooltip = ToolTip.new
         tooltip.page = page
-        upon! tooltip, **na, &b
+        tooltip.send! **na, &b
         _abi_set_tool_tip tooltip.widget if tooltip.widget
       else
         widget = _abi_get_tool_tip
@@ -146,12 +148,12 @@ module Tgui
       end
     end
 
-    def pack_animation_time o
+    def self_pack_animation_time o
       o ? o.to_i : 1000
     end
 
-    abi_def :move, :move_with_animation, ["SizeLayout", :pack_animation_time] => nil
-    abi_def :resize, :resize_with_animation, ["PositionLayout", :pack_animation_time] => nil
+    abi_def :move, :move_with_animation, ["SizeLayout", :self_pack_animation_time] => nil
+    abi_def :resize, :resize_with_animation, ["PositionLayout", :self_pack_animation_time] => nil
 
     abi_enum "AnimationType", :move, :resize, :opacity
 
@@ -159,6 +161,50 @@ module Tgui
     abi_def :front, :move_to_
     abi_def :back, :move_to_
 
+    class Navigation < WidgetLike
+
+      def left=(widget)
+        host._abi_set_navigation host.abi_pack(Widget, widget), host.abi_pack_integer(0)
+      end
+
+      def left
+        abi_unpack(Widget, host._abi_get_navigation(host.abi_pack_integer(0)))
+      end
+
+      def right=(widget)
+        host._abi_set_navigation host.abi_pack(Widget, widget), host.abi_pack_integer(1)
+      end
+
+      def right
+        host.abi_unpack(Widget, host._abi_get_navigation(host.abi_pack_integer(1)))
+      end
+
+      def up=(widget)
+        host._abi_set_navigation host.abi_pack(Widget, widget), host.abi_pack_integer(2)
+      end
+
+      def up
+        host.abi_unpack(Widget, host._abi_get_navigation(host.abi_pack_integer(2)))
+      end
+
+      def down=(widget)
+        host._abi_set_navigation host.abi_pack(Widget, widget), host.abi_pack_integer(3)
+      end
+
+      def down
+        host.abi_unpack(Widget, host._abi_get_navigation(host.abi_pack_integer(3)))
+      end
+
+    end
+
+    def! :navigation do |**na, &b|
+      navigation.send! **na, &b
+    end
+
+    def navigation
+      Navigation.new self, nil
+    end
+
     abi_enum "KeyCode", nil, :a, :b, :c, :d, :e, :f, :g, :h, :i, :j, :k, 
       :l, :m, :n, :o, :p, :q, :r, :s, :t, :u, :v, :w, :x, :y, :z,
       :num0, :num1, :num2, :num3, :num4, :num5, :num6, :num7, :num8, :num9,
@@ -212,15 +258,9 @@ module Tgui
 
     def! :robot do |**na, &b|
       robot = Robot.new self
-      upon! robot, **na, &b if block_given?
+      robot.send! **na, &b if block_given?
       robot
     end
-    
-    def flags=(flags)
-      flags.each do |f|
-        send("#{f}=", true)
-      end
-    end
 
     def self.api_attr name, &init
       define_method "#{name}=" do |value|
@@ -234,33 +274,35 @@ module Tgui
       end
     end
 
-
-    def respond_to? name
-      super || bang_respond_to?(name)
-    end
-
-    def method_missing name, *a, **na, &b
-      if name.end_with? "!"
-        bang_method_missing name, *a, **na, &b
-      else super
-      end
-    end
-
     def self_cast_up widget, type = nil, equip: true
       return nil if widget.null?
       type = abi_unpack_string(Widget.get_type widget) if !type
       casted = Tgui.const_get(type).new pointer: widget
-      equip_child_widget casted if equip
+      self_equip_child_widget casted if equip
       casted
     end
 
+    abi_packer Widget do |o|
+      o = o.first if o.is_a? Array
+      case o
+      when Widget
+        o
+      else
+        raise "Unable to make Widget from #{o}(#{o.class})"
+      end
+    end
+
+    abi_unpacker Widget do |o|
+      self_cast_up o
+    end
+
     abi_static :get_type
     abi_static :get_unshared
 
     class << self
       include ApiChild
 
-      def self_renderer widget, renderer
+      def self_renderer widget, renderer = nil
         case renderer
         when Module
           renderer.name.split("::").last