white_gold 0.0.1 → 0.0.3

data/lib/white_gold/dsl/message_box.rb

@@ -1,3 +1,4 @@
+require_relative 'child_window'
 require_relative 'button'
 require_relative 'signal/signal_string'
 require_relative '../convention/widget_like'
@@ -5,6 +6,11 @@ require_relative '../convention/widget_like'
 module Tgui
   class MessageBox < ChildWindow
 
+    class Theme < ChildWindow::Theme
+      theme_attr :text_color, :color
+      theme_comp :button, Button::Theme
+    end
+
     api_attr :format do
       :to_s
     end
@@ -31,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
@@ -46,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/progress_bar.rb

@@ -5,6 +5,20 @@ require_relative 'signal/signal_u_int'
 module Tgui
   class ProgressBar < ClickableWidget
 
+    class Theme < Widget::Theme
+      theme_attr :borders, :outline
+      theme_attr :text_color, :color
+      theme_attr :text_color_filled, :color
+      theme_attr :background_color, :color
+      theme_attr :fill_color, :color
+      theme_attr :border_color, :color
+      theme_attr :texture_background, :texture
+      theme_attr :texture_fill, :texture
+      theme_attr :text_style, :text_styles
+      theme_attr :text_outline_color, :color
+      theme_attr :text_outline_thickness, :float
+    end
+
     abi_enum "FillDirection", :left_to_right, :right_to_left, :top_to_bottom, :bottom_to_top
     abi_attr :min, Float, :minimum
     abi_attr :max, Float, :maximum

data/lib/white_gold/dsl/radio_button.rb

@@ -3,6 +3,31 @@ require_relative 'signal/signal_bool'
 
 module Tgui
   class RadioButton < ClickableWidget
+
+    class Theme < Widget::Theme
+      theme_attr :borders, :outline
+      theme_attr :text_distance_ratio, :float
+      [ '', :_hover, :_disabled, :_checked, :_checked_hover, :_checked_disabled ].each do |v|
+        theme_attr "text_color#{v}".to_sym, :color
+        theme_attr "background_color#{v}".to_sym, :color
+        theme_attr "border_color#{v}".to_sym, :color
+      end
+      theme_attr :border_color_focused, :color
+      theme_attr :border_color_checked_focused, :color
+      theme_attr :check_color, :color
+      theme_attr :check_color_hover, :color
+      theme_attr :check_color_disabled, :color
+      theme_attr :texture_unchecked, :texture
+      theme_attr :texture_unchecked_hover, :texture
+      theme_attr :texture_unchecked_disabled, :texture
+      theme_attr :texture_unchecked_focused, :texture
+      theme_attr :texture_checked, :texture
+      theme_attr :texture_checked_hover, :texture
+      theme_attr :texture_checked_disabled, :texture
+      theme_attr :texture_checked_focused, :texture
+      theme_attr :text_style, :text_styles
+      theme_attr :text_style_checked, :text_styles
+    end
     
     abi_attr :checked?
     abi_attr :text, String

data/lib/white_gold/dsl/range_slider.rb

@@ -1,9 +1,17 @@
 require_relative 'widget'
+require_relative 'slider'
 require_relative 'signal/signal_range'
 
 module Tgui
   class RangeSlider < Widget
 
+    class Theme < Slider::Theme
+      theme_attr :selected_track_color, :color
+      theme_attr :selected_track_color_hover, :color
+      theme_attr :texture_selected_track, :texture
+      theme_attr :texture_selected_track_hover, :texture
+    end
+
     abi_attr :min, Float, :minimum
     abi_attr :max, Float, :maximum
     abi_attr :selection_start, Float

data/lib/white_gold/dsl/scrollbar.rb

@@ -4,6 +4,25 @@ require_relative 'signal/signal_u_int'
 module Tgui
   class Scrollbar < Widget
 
+    class Theme < Widget::Theme
+      theme_attr :track_color, :color
+      theme_attr :track_color_hover, :color
+      theme_attr :thumb_color, :color
+      theme_attr :thumb_color_hover, :color
+      theme_attr :arrow_background_color, :color
+      theme_attr :arrow_background_color_hover, :color
+      theme_attr :arrow_color, :color
+      theme_attr :arrow_color_hover, :color
+      theme_attr :texture_track, :texture
+      theme_attr :texture_track_hover, :texture
+      theme_attr :texture_thumb, :texture
+      theme_attr :texture_thumb_hover, :texture
+      theme_attr :texture_arrow_up, :texture
+      theme_attr :texture_arrow_up_hover, :texture
+      theme_attr :texture_arrow_down, :texture
+      theme_attr :texture_arrow_down_hover, :texture
+    end
+
     abi_enum "Policy", :auto, :always, :never
 
     abi_attr :max, Integer, :maximum

data/lib/white_gold/dsl/separator_line.rb

@@ -2,5 +2,10 @@ require_relative 'clickable_widget'
 
 module Tgui
   class SeparatorLine < ClickableWidget
+
+    class Theme < Widget::Theme
+      theme_attr :color, :color
+    end
+    
   end
 end

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/slider.rb

@@ -4,6 +4,21 @@ require_relative 'signal/signal_float'
 module Tgui
   class Slider < Widget
 
+    class Theme < Widget::Theme
+      theme_attr :borders, :outline
+      theme_attr :track_color, :color
+      theme_attr :track_color_hover, :color
+      theme_attr :thumb_color, :color
+      theme_attr :thumb_color_hover, :color
+      theme_attr :border_color, :color
+      theme_attr :border_color_hover, :color
+      theme_attr :texture_track, :texture
+      theme_attr :texture_track_hover, :texture
+      theme_attr :texture_thumb, :texture
+      theme_attr :texture_thumb_hover, :texture
+      theme_attr :thumb_within_track, :boolean
+    end
+
     abi_attr :min, Float, :minimum
     abi_attr :max, Float, :maximum
     abi_attr :value, Float

data/lib/white_gold/dsl/spin_button.rb

@@ -4,6 +4,20 @@ require_relative 'signal/signal_float'
 module Tgui
   class SpinButton < ClickableWidget
 
+    class Theme < Widget::Theme
+      theme_attr :borders, :outline
+      theme_attr :border_between_arrows, :float
+      theme_attr :background_color, :color
+      theme_attr :background_color_hover, :color
+      theme_attr :arrow_color, :color
+      theme_attr :arrow_color_hover, :color
+      theme_attr :border_color, :color
+      theme_attr :texture_arrow_up, :texture
+      theme_attr :texture_arrow_up_hover, :texture
+      theme_attr :texture_arrow_down, :texture
+      theme_attr :texture_arrow_down_hover, :texture
+    end
+
     abi_attr :min, Float, :minimum
     abi_attr :max, Float, :maximum
     abi_attr :value, Float

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

@@ -5,6 +5,30 @@ require_relative 'signal/signal'
 module Tgui
   class Tabs < Widget
 
+    class Theme < Widget::Theme
+      theme_attr :borders, :outline
+      theme_attr :background_color, :color
+      theme_attr :background_color_hover, :color
+      theme_attr :background_color_disabled, :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 :text_color_disabled, :color
+      theme_attr :selected_text_color, :color
+      theme_attr :selected_text_color_hover, :color
+      theme_attr :border_color, :color
+      theme_attr :border_color_hover, :color
+      theme_attr :selected_border_color, :color
+      theme_attr :selected_border_color_hover, :color
+      theme_attr :texture_tab, :texture
+      theme_attr :texture_tab_hover, :texture
+      theme_attr :texture_selected_tab, :texture
+      theme_attr :texture_selected_tab_hover, :texture
+      theme_attr :texture_disabled_tab, :texture
+      theme_attr :distance_to_side, :float
+    end
+
     class Tab < WidgetLike
 
       abi_def :text=, :change_text, id: 0, String => nil
@@ -37,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
@@ -77,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/text_area.rb

@@ -6,6 +6,22 @@ require_relative 'signal/signal_string'
 module Tgui
   class TextArea < Widget
 
+    class Theme < Widget::Theme
+      theme_attr :borders, :outline
+      theme_attr :padding, :outline
+      theme_attr :background_color, :color
+      theme_attr :text_color, :color
+      theme_attr :default_text_color, :color
+      theme_attr :selected_text_color, :color
+      theme_attr :selected_text_background_color, :color
+      theme_attr :border_color, :color
+      theme_attr :caret_color, :color
+      theme_attr :texture_background, :texture
+      theme_attr :caret_width, :float
+      theme_comp :scrollbar, Scrollbar::Theme
+      theme_attr :scrollbar_width, :float
+    end
+
     abi_attr :text, String
     abi_def :add_text, String => nil
     abi_attr :default_text, String

data/lib/white_gold/dsl/theme.rb

@@ -1,9 +1,7 @@
 require 'tempfile'
 require_relative '../abi/extern_object'
 require_relative '../convention/bang_nest'
-Dir.each_child File.dirname(__FILE__) + "/theme" do |filename|
-  require_relative "theme/#{filename}"
-end
+require_relative '../convention/theme/theme_attributed'
 
 module Tgui
   class Theme < ExternObject
@@ -63,59 +61,20 @@ module Tgui
       self.attributes = {}
     end
 
-    def! :custom do |comp, seed, **na, &b|
+    @@debug = false
+    def debug=(debug)
+      @@debug = debug
+    end
+
+    def! :custom do |type, seed, **na, &b|
       self.next_renderer_id = renderer_id = next_renderer_id.next
-      send("#{comp}!", renderer_id, seed, **na, &b)
+      attribute = type.new(seed, renderer_id)
+      attributes[attribute.name] = attribute
+      attribute.send! **na, &b
       self_commit
       renderer_id
     end
 
-
-    theme_attr :text_color, :color
-    theme_attr :text_color_hover, :color
-    theme_attr :text_color_disabled, :color
-    theme_attr :background_color, :color
-    theme_attr :background_color_hover, :color
-    theme_attr :background_color_disabled, :color
-    theme_attr :selected_text_color, :color
-    theme_attr :selected_text_color_hover, :color
-    theme_attr :selected_background_color, :color
-    theme_attr :selected_background_color_hover, :color
-    theme_attr :border_color, :color
-    theme_attr :borders, :outline
-    theme_attr :scrollbar_width, :float
-    theme_attr :arrow_background_color, :color
-    theme_attr :arrow_background_color_hover, :color
-    theme_attr :arrow_background_color_disabled, :color
-    theme_attr :arrow_color, :color
-    theme_attr :arrow_color_hover, :color
-    theme_attr :arrow_color_disabled, :color
-
-    theme_comp :button, ButtonTheme
-    theme_comp :chat_box, ChatBoxTheme
-    theme_comp :child_window, ChildWindowTheme
-    theme_comp :color_picker, ColorPickerTheme
-    theme_comp :combobox, ComboBoxTheme, "ComboBox"
-    theme_comp :editbox, EditBoxTheme, "EditBox"
-    theme_comp :file_dialog, FileDialogTheme
-    theme_comp :group, GroupTheme
-    theme_comp :knob, KnobTheme
-    theme_comp :label, LabelTheme
-    theme_comp :listbox, ListBoxTheme, "ListBox"
-    theme_comp :list_view, ListViewTheme
-    theme_comp :menu, MenuBarTheme, "MenuBar"
-    theme_comp :message_box, MessageBoxTheme
-    theme_comp :progress_bar, ProgressBarTheme
-    theme_comp :radio_button, RadioButtonTheme
-    theme_comp :scrollbar, ScrollbarTheme
-    theme_comp :separator, SeparatorLineTheme
-    theme_comp :slider, SliderTheme
-    theme_comp :spin_button, SpinButtonTheme
-    theme_comp :tabs, TabsTheme
-    theme_comp :text_area, TextAreaTheme
-    theme_comp :tree_view, TreeViewTheme
-    theme_comp :widget, WidgetTheme
-    
     def self_commit custom_rendered = nil
       if attributes.size > 0
         file = Tempfile.new
@@ -129,6 +88,7 @@ module Tgui
             file << v.to_theme << "\n"
           end
           file.close
+          puts File.readlines(file.path) if @@debug
           _abi_load file.path
         ensure
           file.close!