white_gold 0.0.1 → 0.0.3

data/lib/white_gold/dsl/canvas.rb

@@ -0,0 +1,40 @@
+require_relative 'clickable_widget'
+
+module Tgui
+  class Canvas < ClickableWidget
+
+    class Draw < WidgetLike
+
+      def! :fill do |*color|
+        host._abi_clear host.abi_pack(Color, *color)
+      end
+
+      def! :rectangle do |**na, &b|
+        shape = RectangleShape.new.send! **na, &b
+        host._abi_draw shape
+      end
+
+      def! :circle do |**na, &b|
+        shape = CircleShape.new.send! **na, &b
+        host._abi_draw shape
+      end
+
+      def! :convex do |**na, &b|
+        shape = ConvexShape.new.send! **na, &b
+        host._abi_draw shape
+      end
+
+      def! :text do |**na, &b|
+        text = Text.new.send! **na, &b
+        host._abi_draw text
+      end
+
+    end
+
+    def! :draw do |&b|
+      Draw.new(self, nil).send! &b
+      _abi_display
+    end
+
+  end
+end

data/lib/white_gold/dsl/chat_box.rb

@@ -1,9 +1,20 @@
 require_relative 'widget'
+require_relative 'scrollbar'
 require_relative '../convention/widget_like'
 
 module Tgui
   class ChatBox < Widget
 
+    class Theme < Widget::Theme
+      theme_attr :borders, :outline
+      theme_attr :padding, :outline
+      theme_attr :background_color, :color
+      theme_attr :border_color, :color
+      theme_attr :texture_background, :texture
+      theme_comp :scrollbar, Scrollbar::Theme
+      theme_attr :scrollbar_width, :float
+    end
+
     api_attr :objects do
       []
     end
@@ -33,7 +44,7 @@ module Tgui
       _abi_add_line abi_pack_string(text), abi_pack(Color, color), abi_pack(TextStyles, *style)
       line = Line.new self, objects.size
       objects << object
-      upon! line, **na, &b
+      line.send! **na, &b
     end
 
     def [](index)

data/lib/white_gold/dsl/child_window.rb

@@ -1,13 +1,34 @@
 require_relative 'container'
+require_relative 'button'
 require_relative 'signal/signal'
 
 module Tgui
   class ChildWindow < Container
 
+    class Theme < Widget::Theme
+      theme_attr :borders, :outline
+      theme_attr :title_bar_height, :float
+      theme_attr :title_bar_color, :color
+      theme_attr :title_color, :color
+      theme_attr :background_color, :color
+      theme_attr :border_color, :color
+      theme_attr :border_color_focused, :color
+      theme_attr :border_below_title_bar, :float
+      theme_attr :distance_to_side, :float
+      theme_attr :padding_between_buttons, :float
+      theme_attr :minimum_resizable_border_width, :float
+      theme_attr :show_text_on_title_buttons, :boolean
+      theme_attr :texture_title_bar, :texture
+      theme_attr :texture_background, :texture
+      theme_comp :close_button, Button::Theme
+      theme_comp :maximize_button, Button::Theme
+      theme_comp :minimize_button, Button::Theme
+    end
+
     class SignalClosing < Tgui::Signal
       def block_caller &b
         Fiddle::Closure::BlockCaller.new(0, [Fiddle::TYPE_VOIDP]) do |ptr|
-          @widget.page.upon! @widget do
+          @widget.send! do
             b.(ptr, @widget)
           end
         end

data/lib/white_gold/dsl/color.rb

@@ -21,6 +21,9 @@ module Tgui
           return arg
         when String
           r, g, b, a = *tones_from_string(arg)
+        when :random
+          r, g, b = 5.times.map{ rand 255 }
+          a = 255
         when Symbol
           r, g, b, a = *PREDEFINED_COLORS[arg]
         when Numeric
@@ -61,12 +64,12 @@ module Tgui
       Color.new *Color.hsv_to_rgb(h, s, (v - shadow).clamp(0, 255)), alpha
     end
 
-    def to_a
+    def to_arr
       [red, green, blue, alpha]
     end
 
     def to_s
-      "##{to_a.map{ _1.to_s(16).ljust(2, '0') }.join}"
+      "##{to_arr.map{ _1.to_s(16).ljust(2, '0') }.join}"
     end
 
     def inspect

data/lib/white_gold/dsl/color_picker.rb

@@ -1,9 +1,18 @@
 require_relative 'child_window'
+require_relative 'button'
+require_relative 'label'
+require_relative 'slider'
 require_relative 'signal/signal_color'
 
 module Tgui
   class ColorPicker < ChildWindow
 
+    class Theme < ChildWindow::Theme
+      theme_comp :button, Button::Theme
+      theme_comp :label, Label::Theme
+      theme_comp :slider, Slider::Theme
+    end
+
     abi_attr :color, Color
     abi_signal :on_color_change, SignalColor
     abi_signal :on_ok_press, SignalColor

data/lib/white_gold/dsl/combo_box.rb

@@ -1,15 +1,43 @@
 require_relative 'widget'
+require_relative 'list_box'
 require_relative 'signal/signal_item'
 require_relative '../convention/widget_like'
 
 module Tgui
   class ComboBox < Widget
 
+    class Theme < Widget::Theme
+      theme_attr :borders, :outline
+      theme_attr :padding, :outline
+      theme_attr :text_style, :text_styles
+      theme_attr :default_text_style, :text_styles
+      theme_attr :background_color, :color
+      theme_attr :background_color_disabled, :color
+      theme_attr :text_color, :color
+      theme_attr :text_color_disabled, :color
+      theme_attr :default_text_color, :color
+      theme_attr :arrow_background_color, :color
+      theme_attr :arrow_background_color_disabled, :color
+      theme_attr :arrow_background_color_hover, :color
+      theme_attr :arrow_color, :color
+      theme_attr :arrow_color_hover, :color
+      theme_attr :arrow_color_disabled, :color
+      theme_attr :texture_background, :texture
+      theme_attr :texture_background_disabled, :texture
+      theme_attr :border_color, :color
+      theme_attr :texture_background, :texture
+      theme_attr :texture_background_disabled, :texture
+      theme_attr :texture_arrow, :texture
+      theme_attr :texture_arrow_hover, :texture
+      theme_attr :texture_arrow_disabled, :texture
+      theme_comp :list_box, ListBox::Theme
+    end
+
     class SignalItem < Tgui::SignalItem
       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
@@ -71,7 +99,7 @@ module Tgui
       _abi_add_item abi_pack_string(text), abi_pack_string(id)
       item = Item.new self, id
       self_objects[id] = object
-      upon! item, **na, &b
+      item.send! **na, &b
     end
 
     def selected

data/lib/white_gold/dsl/container.rb

@@ -19,7 +19,7 @@ module Tgui
     abi_def :remove, Widget => nil
 
     def move_front widget, ceil = false
-      widget = abi_pack_widget widget
+      widget = abi_pack(Widget, widget)
       if ceil
         _abi_move_widget_to_front widget
       else
@@ -28,7 +28,7 @@ module Tgui
     end
 
     def move_back widget, floor = false
-      widget = abi_pack_widget widget
+      widget = abi_pack(Widget, widget)
       if floor
         _abi_move_widget_to_back widget
       else
@@ -37,13 +37,21 @@ module Tgui
     end
 
     def move_at index, widget
-      _abi_set_widget_index abi_pack_widget(widget), abi_pack_integer(index)
+      _abi_set_widget_index abi_pack(Widget, widget), abi_pack_integer(index)
     end
 
     abi_def :index, :get_widget_, Widget => Integer
     abi_def :focused_child, :get_, nil => Widget
     abi_def :focused_leaf, :get_, nil => Widget
-    abi_def :leaf_at_position, :get_widget_at_position, [Float, Float] => Widget
+
+    def leaf_at_position x, y
+      abi_unpack(Widget, _abi_get_widget_at_pos(api_pack_float(x), abi_pack_float(y), abi_pack_boolean(true)))
+    end
+
+    def child_at_position x, y
+      abi_unpack(Widget, _abi_get_widget_at_pos(api_pack_float(x), abi_pack_float(y), abi_pack_boolean(false)))
+    end
+
     abi_def :focus_next, :focus_next_widget
     abi_def :focus_previous, :focus_previous_widget
 
@@ -66,21 +74,19 @@ module Tgui
 
     # internal
 
-    def abi_pack_widget o
+
+    abi_packer Widget do |o|
+      o = o.first if o.is_a? Array
       case o
       when Symbol
         self[o]
       when Widget
         o
       else
-        raise "Unable to make Widget from #{o}"
+        raise "Unable to make Widget from #{o}(#{o.class})"
       end
     end
-
-    def abi_unpack_widget o
-      self_cast_up o
-    end
-
+    
     def self_get_widget_name a
       case a
       when Widget

data/lib/white_gold/dsl/edit_box.rb

@@ -5,6 +5,35 @@ require_relative 'signal/signal_typed_size_t'
 module Tgui
   class EditBox < ClickableWidget
 
+    class Theme < Widget::Theme
+      theme_attr :text_style, :text_styles
+      theme_attr :default_text_style, :text_styles
+      theme_attr :borders, :outline
+      theme_attr :padding, :outline
+      theme_attr :caret_width, :float
+      theme_attr :text_color, :color
+      theme_attr :text_color_disabled, :color
+      theme_attr :text_color_focused, :color
+      theme_attr :selected_text_color, :color
+      theme_attr :selected_text_background_color, :color
+      theme_attr :default_text_color, :color
+      theme_attr :background_color, :color
+      theme_attr :background_color_hover, :color
+      theme_attr :background_color_disabled, :color
+      theme_attr :background_color_focused, :color
+      theme_attr :caret_color, :color
+      theme_attr :caret_color_hover, :color
+      theme_attr :caret_color_focused, :color
+      theme_attr :border_color, :color
+      theme_attr :border_color_hover, :color
+      theme_attr :border_color_disabled, :color
+      theme_attr :border_color_focused, :color
+      theme_attr :texture, :texture
+      theme_attr :texture_hover, :texture
+      theme_attr :texture_disabled, :texture
+      theme_attr :texture_focused, :texture
+    end
+
     def abi_pack_integer_range *a
       if a.size == 1
         if a[0].is_a? Range

data/lib/white_gold/dsl/file_dialog.rb

@@ -1,8 +1,25 @@
 require_relative 'child_window'
+require_relative 'list_view'
+require_relative 'edit_box'
+require_relative 'label'
+require_relative 'combo_box'
+require_relative 'button'
 
 module Tgui
   class FileDialog < ChildWindow
 
+    class Theme < ChildWindow::Theme
+      theme_comp :list_view, ListView::Theme
+      theme_comp :edit_box, EditBox::Theme
+      theme_comp :filename_label, Label::Theme
+      theme_comp :file_type_combo_box, ComboBox::Theme
+      theme_comp :button, Button::Theme
+      theme_comp :back_button, Button::Theme
+      theme_comp :forward_button, Button::Theme
+      theme_comp :up_button, Button::Theme
+      theme_attr :arrow_on_navigation_buttons_visible, :boolean
+    end
+
     abi_def :selected_paths, nil => (String..) # not empty only in onFileSelected callback
     abi_attr :path, String
     abi_attr :filename, String

data/lib/white_gold/dsl/font.rb

@@ -18,6 +18,10 @@ module Tgui
       end
       Font.new id
     end
-    
+
+    def self.default
+      Font.new pointer: _abi_get_global_font
+    end
+
   end
 end

data/lib/white_gold/dsl/grid.rb

@@ -84,9 +84,9 @@ module Tgui
 
     def add widget, id
       super
-      _abi_set_widget_cell abi_pack_widget(widget), *cell
-      _abi_set_widget_alignment abi_pack_widget(widget), abi_pack(Alignment, alignment) if alignment
-      _abi_set_widget_padding abi_pack_widget(widget), abi_pack(Outline, *padding) if padding
+      _abi_set_widget_cell abi_pack(Widget, widget), *cell
+      _abi_set_widget_alignment abi_pack(Widget, widget), abi_pack(Alignment, alignment) if alignment
+      _abi_set_widget_padding abi_pack(Widget, widget), abi_pack(Outline, *padding) if padding
       if direction == :column
         next_column false
       else

data/lib/white_gold/dsl/group.rb

@@ -2,5 +2,10 @@ require_relative 'container'
 
 module Tgui
   class Group < Container
+
+    class Theme < Widget::Theme
+      theme_attr :padding, :outline
+    end
+
   end
 end

data/lib/white_gold/dsl/knob.rb

@@ -4,6 +4,16 @@ require_relative 'signal/signal_float'
 module Tgui
   class Knob < Widget
 
+    class Theme < Widget::Theme
+      theme_attr :borders, :outline
+      theme_attr :background_color, :color
+      theme_attr :thumb_color, :color
+      theme_attr :border_color, :color
+      theme_attr :texture_background, :texture
+      theme_attr :texture_foreground, :texture
+      theme_attr :image_rotation, :float
+    end
+
     abi_attr :start, Float, :start_rotation
     abi_attr :end, Float, :end_rotation
     abi_attr :min, Float, :minimum

data/lib/white_gold/dsl/label.rb

@@ -4,6 +4,20 @@ require_relative 'scrollbar'
 module Tgui
   class Label < ClickableWidget
 
+    class Theme < Widget::Theme
+      theme_attr :borders, :outline
+      theme_attr :padding, :outline
+      theme_attr :text_color, :color
+      theme_attr :background_color, :color
+      theme_attr :border_color, :color
+      theme_attr :text_style, :text_styles
+      theme_attr :text_outline_color, :color
+      theme_attr :text_outline_thickness, :float
+      theme_attr :texture_background, :texture
+      theme_comp :scrollbar, Scrollbar::Theme
+      theme_attr :scrollbar_width, :float
+    end
+
     abi_attr :text, String
     abi_attr :scrollbar_value, Integer
     abi_attr :auto_size?, Boolean, :get_

data/lib/white_gold/dsl/list_box.rb

@@ -1,15 +1,35 @@
 require_relative 'widget'
+require_relative 'scrollbar'
 require_relative 'signal/signal_item'
 require_relative 'signal/signal_u_int'
 
 module Tgui
   class ListBox < Widget
 
+    class Theme < Widget::Theme
+      theme_attr :borders, :outline
+      theme_attr :padding, :outline
+      theme_attr :text_style, :text_styles
+      theme_attr :selected_text_style, :text_styles
+      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 :text_color, :color
+      theme_attr :text_color_hover, :color
+      theme_attr :selected_text_color, :color
+      theme_attr :selected_text_color_hover, :color
+      theme_attr :border_color, :color
+      theme_attr :texture_background, :texture
+      theme_comp :scrollbar, Scrollbar::Theme
+      theme_attr :scrollbar_width, :float
+    end
+
     class SignalItem < Tgui::SignalItem
       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
@@ -35,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
 
@@ -64,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

@@ -1,14 +1,37 @@
 require_relative 'widget'
+require_relative 'scrollbar'
 require_relative '../convention/widget_like'
 require_relative 'signal/signal_int'
 
 module Tgui
   class ListView < 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 :text_color, :color
+      theme_attr :text_color_hover, :color
+      theme_attr :selected_text_color, :color
+      theme_attr :selected_text_color_hover, :color
+      theme_attr :header_background_color, :color
+      theme_attr :header_text_color, :color
+      theme_attr :border_color, :color
+      theme_attr :separator_color, :color
+      theme_attr :grid_lines_color, :color
+      theme_attr :texture_header_background, :texture
+      theme_attr :texture_background, :texture
+      theme_comp :scrollbar, Scrollbar::Theme
+      theme_attr :scrollbar_width, :float
+    end
+
     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
@@ -18,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
@@ -70,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)
@@ -150,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)
@@ -176,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,10 +1,27 @@
 require_relative 'widget'
+require_relative '../convention/tree_node'
 require_relative '../convention/widget_like'
 require_relative 'signal/signal_item_hierarchy'
 
 module Tgui
   class MenuBar < Widget
 
+    class Theme < Widget::Theme
+      theme_attr :background_color, :color
+      theme_attr :selected_background_color, :color
+      theme_attr :text_color, :color
+      theme_attr :selected_text_color, :color
+      theme_attr :text_color_disabled, :color
+      theme_attr :separator_color, :color
+      theme_attr :texture_background, :texture
+      theme_attr :texture_item_background, :texture
+      theme_attr :texture_selected_item_background, :texture
+      theme_attr :distance_to_side, :float
+      theme_attr :separator_thickness, :float
+      theme_attr :separator_vertical_padding, :float
+      theme_attr :separator_side_padding, :float
+    end
+
     class ItemPressSignal
       def initialize menu_bar, path
         @menu_bar = menu_bar
@@ -13,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
@@ -40,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
@@ -106,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
@@ -192,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)