white_gold 0.0.2 → 0.0.4

data/lib/white_gold/dsl/widget.rb

@@ -1,5 +1,5 @@
 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'
@@ -15,7 +15,7 @@ require_relative 'tool_tip'
 
 module Tgui
   class Widget < ExternObject
-    include BangNestedCaller
+    include BangNest
     extend BangDef
 
     class Theme < ThemeComponent
@@ -40,40 +40,40 @@ module Tgui
       self.enabled = !disabled
     end
 
-    def theme_comp
-      :widget
-    end
-
-    def! :renderer do |seed = VOID, **na, &b|
+    def! :theme do |seed = VOID, **na, &b|
       seed = page.custom_renderers[self] if seed == VOID
       if !na.empty? || b
-        upon! page.theme do
-          seed = custom! self.class::Theme, seed, **na, &b
+        if seed.is_a?(String) && seed =~ /_\d+/
+          page.theme.attributes[seed].host! **na, &b
+          page.theme.self_commit
+        else
+          seed = page.theme.custom! self.class::Theme, seed, **na, &b
+          page.custom_renderers[self] = seed
         end
-        page.custom_renderers[self] = seed
-      elsif !seed
-        page.custom_renderers.delete self
-      else
+      elsif seed
         page.custom_renderers[self] = seed
       end
-      self.self_renderer = seed
+      self_set_renderer seed
     end
 
-    def renderer=(renderer)
-      case renderer
+    def theme=(theme)
+      case theme
       when Hash
-        api_bang_renderer **renderer
+        api_bang_theme **theme
       when Proc
-        api_bang_renderer &renderer
+        api_bang_theme &theme
       else
-        page.custom_renderers[self] = renderer
-        self.self_renderer = renderer
+        page.custom_renderers[self] = theme
+        self_set_renderer theme
       end
     end
 
-    abi_def :self_renderer=, :set_renderer, proc.self_renderer => nil
+    abi_def :self_set_renderer, :set_renderer, proc.self_theme_name => nil
     
     abi_attr :focused?
+    def! :focus do |focus = VOID|
+      self.focused = focus
+    end
     abi_attr :focusable?
     abi_signal :on_position_change, Tgui::SignalVector2f
     abi_signal :on_size_change, Tgui::SignalVector2f
@@ -99,6 +99,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
 
@@ -106,7 +109,7 @@ module Tgui
       if block_given?
         tooltip = ToolTip.new
         tooltip.page = page
-        upon! tooltip, **na, &b
+        scope! tooltip, **na, &b
         _abi_set_tool_tip tooltip.widget if tooltip.widget
       else
         widget = _abi_get_tool_tip
@@ -155,12 +158,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
 
@@ -168,7 +171,51 @@ module Tgui
     abi_def :front, :move_to_
     abi_def :back, :move_to_
 
-    abi_enum "KeyCode", nil, :a, :b, :c, :d, :e, :f, :g, :h, :i, :j, :k, 
+    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|
+      scope! navigation, **na, &b
+    end
+
+    def navigation
+      Navigation.new self, nil
+    end
+
+    abi_enum "KeyCode", :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,
       :escape, :left_control, :left_shift, :left_alt, :left_system,
@@ -221,14 +268,28 @@ module Tgui
 
     def! :robot do |**na, &b|
       robot = Robot.new self
-      upon! robot, **na, &b if block_given?
+      scope! robot, **na, &b if block_given?
       robot
     end
-    
-    def flags=(flags)
-      flags.each do |f|
-        send("#{f}=", true)
+
+    def! :messagebox do |*a, **na, &b|
+      page.api_bang_messagebox *a, **na, &b
+    end
+
+    def! :msg do |text, **buttons|
+      buttons["OK"] = nil if buttons.empty?
+      buttons = buttons.map do |k, v| 
+        procedure = proc do |o, b, w|
+          v&.call
+          w.close true
+        end
+        [k, procedure]
       end
+      page.api_bang_messagebox text:, position: :center, label_alignment: :center, buttons: buttons
+    end
+
+    def! :page do |*a, **na, &b|
+      page.host! *a, **na, &b
     end
 
     def self.api_attr name, &init
@@ -243,40 +304,42 @@ 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
-        case renderer
+      def self_theme_name widget, theme = nil
+        case theme
         when Module
-          renderer.name.split("::").last
+          theme.name.split("::").last
         when nil, false, VOID
-          self_renderer widget, widget.class
+          self_theme_name widget, widget.class
         else
-          renderer.to_s
+          theme.to_s
         end
       end
 

data/lib/white_gold/dsl/window.rb

@@ -11,6 +11,13 @@ module Tgui
     end
     abi_def :open?
     abi_def :title=, String => nil
+    abi_attr :size, Vector2u
+    abi_attr :position, Vector2u
+    abi_def :has_focus?, nil => Boolean
+    abi_def :request_focus
+    def! :request_focus do
+      request_focus
+    end
 
   end
 end