fidgit 0.2.4 → 0.2.5

data/examples/splash_example.rb

@@ -1,42 +1,42 @@
-require_relative 'helpers/example_window'
-
-# By using a splash screen of some sort, one can switch to another resolution for the main game.
-class ExampleState < Fidgit::GuiState
-  def initialize
-    super
-    vertical do
-      horizontal do
-        text = label "Width:"
-
-        @width_combo = combo_box(value: [640, 480]) do
-          [[640, 480], [800, 600], [Gosu::screen_width, Gosu::screen_height]].each do |width, height|
-            item "#{width}x#{height}", [width, height]
-          end
-        end
-      end
-
-      @full_screen_button = toggle_button "Fullscreen?"
-
-      button "Load game", icon: Gosu::Image["head_icon.png"] do
-        $window.close
-        window = Chingu::Window.new(*@width_combo.value, @full_screen_button.value)
-        window.push_game_state ExampleAfterState
-        window.show
-      end
-    end
-  end
-end
-
-class ExampleAfterState < GuiState
-  def initialize
-    super
-
-    on_input(:esc, :exit)
-
-    vertical do
-      label "Game loaded!", icon: Gosu::Image["head_icon.png"], border_color: Gosu::Color.rgb(255, 255, 255)
-    end
-  end
-end
-
+require_relative 'helpers/example_window'
+
+# By using a splash screen of some sort, one can switch to another resolution for the main game.
+class ExampleState < Fidgit::GuiState
+  def initialize
+    super
+    vertical do
+      horizontal do
+        text = label "Width:"
+
+        @width_combo = combo_box(value: [640, 480]) do
+          [[640, 480], [800, 600], [Gosu::screen_width, Gosu::screen_height]].each do |width, height|
+            item "#{width}x#{height}", [width, height]
+          end
+        end
+      end
+
+      @full_screen_button = toggle_button "Fullscreen?"
+
+      button "Load game", icon: Gosu::Image["head_icon.png"] do
+        $window.close
+        window = Chingu::Window.new(*@width_combo.value, @full_screen_button.value)
+        window.push_game_state ExampleAfterState
+        window.show
+      end
+    end
+  end
+end
+
+class ExampleAfterState < GuiState
+  def initialize
+    super
+
+    on_input(:esc, :exit)
+
+    vertical do
+      label "Game loaded!", icon: Gosu::Image["head_icon.png"], border_color: Gosu::Color.rgb(255, 255, 255)
+    end
+  end
+end
+
 ExampleWindow.new.show

data/examples/text_area_example.rb

@@ -1,33 +1,33 @@
-require_relative 'helpers/example_window'
-
-class ExampleState < Fidgit::GuiState
-  def initialize
-    super
-
-    Gosu.register_entity(:entity, Gosu::Image["head_icon.png"])
-
-    string = "<c=3333ff>Hello, my name</c> is <c=ff0000>Brian</c> the&entity;&entity;snail!"
-    horizontal do
-      vertical do
-        label 'disabled'
-        text_area(text: "Can't even select this text", width: 200, enabled: false)
-      end
-
-      vertical do
-        label 'mirrors to right'
-        text_area(width: 200, text: string) do |_, text|
-          @mirror.text = text
-        end
-      end
-
-      vertical do
-        my_label = label 'not editable'
-        font = Gosu::Font.new($window, "", my_label.font.height)
-        font["a"] = Gosu::Image["head_icon.png"]
-        @mirror = text_area(text: string, width: 200, editable: false, font: font)
-      end
-    end
-  end
-end
-
+require_relative 'helpers/example_window'
+
+class ExampleState < Fidgit::GuiState
+  def initialize
+    super
+
+    Gosu.register_entity(:entity, Gosu::Image["head_icon.png"])
+
+    string = "<c=3333ff>Hello, my name</c> is <c=ff0000>Brian</c> the&entity;&entity;snail!"
+    horizontal do
+      vertical do
+        label 'disabled'
+        text_area(text: "Can't even select this text", width: 200, enabled: false)
+      end
+
+      vertical do
+        label 'mirrors to right'
+        text_area(width: 200, text: string) do |_, text|
+          @mirror.text = text
+        end
+      end
+
+      vertical do
+        my_label = label 'not editable'
+        font = Gosu::Font.new($window, "", my_label.font.height)
+        font["a"] = Gosu::Image["head_icon.png"]
+        @mirror = text_area(text: string, width: 200, editable: false, font: font)
+      end
+    end
+  end
+end
+
 ExampleWindow.new.show

data/fidgit.gemspec

@@ -1,35 +1,35 @@
-# -*- encoding: utf-8 -*-
-$:.unshift File.expand_path("../lib", __FILE__)
-require "fidgit/version"
-
-Gem::Specification.new do |s|
-  s.name        = "fidgit"
-  s.version     = Fidgit::VERSION
-  s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Bil Bas (Spooner)"]
-  s.email       = ["bil.bagpuss@gmail.com"]
-  s.homepage    = "http://github.com/Spooner/fidgit/"
-  s.summary     = %q{Fidgit is a GUI library built on Gosu/Chingu}
-  s.description = %q{Fidgit is a GUI library built on Gosu/Chingu}
-
-  s.rubyforge_project = "fidgit"
-  s.has_rdoc = true
-  s.required_ruby_version = "~> 1.9.2"
-  
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
-  s.license       = "MIT"
-
-  s.add_runtime_dependency('gosu', '~> 0.7.41')
-  s.add_runtime_dependency('chingu', '~> 0.9rc7')
-  s.add_runtime_dependency('clipboard', '~> 0.9.9')
-  s.add_runtime_dependency('ffi', '~> 1.0.11')
-
-  s.add_development_dependency('rspec', '~> 2.8.0')
-  s.add_development_dependency('texplay', '~> 0.3.5')
-  s.add_development_dependency('rake')
-  s.add_development_dependency('yard')
-  s.add_development_dependency('RedCloth', "~> 4.2.9")
-end
+# -*- encoding: utf-8 -*-
+$:.unshift File.expand_path("../lib", __FILE__)
+require "fidgit/version"
+
+Gem::Specification.new do |s|
+  s.name        = "fidgit"
+  s.version     = Fidgit::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ["Bil Bas (Spooner)"]
+  s.email       = ["bil.bagpuss@gmail.com"]
+  s.homepage    = "http://github.com/Spooner/fidgit/"
+  s.summary     = %q{Fidgit is a GUI library built on Gosu/Chingu}
+  s.description = %q{Fidgit is a GUI library built on Gosu/Chingu}
+
+  s.rubyforge_project = "fidgit"
+  s.has_rdoc = true
+  s.required_ruby_version = "~> 1.9.2"
+  
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
+  s.license       = "MIT"
+
+  s.add_runtime_dependency('gosu', '~> 0.7.41')
+  s.add_runtime_dependency('chingu', '~> 0.9rc7')
+  s.add_runtime_dependency('clipboard', '~> 0.9.9')
+  s.add_runtime_dependency('ffi', '~> 1.0.11')
+
+  s.add_development_dependency('rspec', '~> 2.8.0')
+  s.add_development_dependency('texplay', '~> 0.4.3')
+  s.add_development_dependency('rake')
+  s.add_development_dependency('yard')
+  s.add_development_dependency('RedCloth', "~> 4.2.9")
+end

data/lib/fidgit.rb

@@ -1,51 +1,51 @@
-# encoding: utf-8
-require 'chingu'
-require 'clipboard'
-
-require_relative "fidgit/cursor"
-require_relative "fidgit/event"
-require_relative "fidgit/history"
-require_relative "fidgit/redirector"
-require_relative "fidgit/schema"
-require_relative "fidgit/selection"
-require_relative "fidgit/version"
-require_relative "fidgit/window"
-
-require_relative "fidgit/chingu_ext/window"
-require_relative "fidgit/gosu_ext/color"
-require_relative "fidgit/gosu_ext/gosu_module"
-require_relative "fidgit/standard_ext/hash"
-
-require_relative "fidgit/elements/element"
-require_relative "fidgit/elements/container"
-require_relative "fidgit/elements/packer"
-require_relative "fidgit/elements/composite"
-require_relative "fidgit/elements/grid"
-require_relative "fidgit/elements/group"
-require_relative "fidgit/elements/label"
-require_relative "fidgit/elements/button"
-require_relative "fidgit/elements/radio_button"
-
-require_relative "fidgit/elements/color_picker"
-require_relative "fidgit/elements/color_well"
-require_relative "fidgit/elements/combo_box"
-require_relative "fidgit/elements/file_browser"
-require_relative "fidgit/elements/horizontal"
-require_relative "fidgit/elements/image_frame"
-require_relative "fidgit/elements/list"
-require_relative "fidgit/elements/main_packer"
-require_relative "fidgit/elements/menu_pane"
-require_relative "fidgit/elements/scroll_area"
-require_relative "fidgit/elements/scroll_bar"
-require_relative "fidgit/elements/scroll_window"
-require_relative "fidgit/elements/slider"
-require_relative "fidgit/elements/text_area"
-require_relative "fidgit/elements/text_line"
-require_relative "fidgit/elements/toggle_button"
-require_relative "fidgit/elements/tool_tip"
-require_relative "fidgit/elements/vertical"
-
-require_relative "fidgit/states/gui_state"
-require_relative "fidgit/states/dialog_state"
-require_relative "fidgit/states/file_dialog"
+# encoding: utf-8
+require 'chingu'
+require 'clipboard'
+
+require_relative "fidgit/cursor"
+require_relative "fidgit/event"
+require_relative "fidgit/history"
+require_relative "fidgit/redirector"
+require_relative "fidgit/schema"
+require_relative "fidgit/selection"
+require_relative "fidgit/version"
+require_relative "fidgit/window"
+
+require_relative "fidgit/chingu_ext/window"
+require_relative "fidgit/gosu_ext/color"
+require_relative "fidgit/gosu_ext/gosu_module"
+require_relative "fidgit/standard_ext/hash"
+
+require_relative "fidgit/elements/element"
+require_relative "fidgit/elements/container"
+require_relative "fidgit/elements/packer"
+require_relative "fidgit/elements/composite"
+require_relative "fidgit/elements/grid"
+require_relative "fidgit/elements/group"
+require_relative "fidgit/elements/label"
+require_relative "fidgit/elements/button"
+require_relative "fidgit/elements/radio_button"
+
+require_relative "fidgit/elements/color_picker"
+require_relative "fidgit/elements/color_well"
+require_relative "fidgit/elements/combo_box"
+require_relative "fidgit/elements/file_browser"
+require_relative "fidgit/elements/horizontal"
+require_relative "fidgit/elements/image_frame"
+require_relative "fidgit/elements/list"
+require_relative "fidgit/elements/main_packer"
+require_relative "fidgit/elements/menu_pane"
+require_relative "fidgit/elements/scroll_area"
+require_relative "fidgit/elements/scroll_bar"
+require_relative "fidgit/elements/scroll_window"
+require_relative "fidgit/elements/slider"
+require_relative "fidgit/elements/text_area"
+require_relative "fidgit/elements/text_line"
+require_relative "fidgit/elements/toggle_button"
+require_relative "fidgit/elements/tool_tip"
+require_relative "fidgit/elements/vertical"
+
+require_relative "fidgit/states/gui_state"
+require_relative "fidgit/states/dialog_state"
+require_relative "fidgit/states/file_dialog"
 require_relative "fidgit/states/message_dialog"

data/lib/fidgit/chingu_ext/window.rb

@@ -1,6 +1,6 @@
-module Chingu
-  class Window
-    # Include fidgits extra functionality in the Chingu window (which is minimal).
-    include Fidgit::Window
-  end
+module Chingu
+  class Window
+    # Include fidgits extra functionality in the Chingu window (which is minimal).
+    include Fidgit::Window
+  end
 end

data/lib/fidgit/cursor.rb

@@ -1,38 +1,38 @@
-# encoding: utf-8
-
-module Fidgit
-  class Cursor < Chingu::GameObject
-    ARROW = 'arrow.png'
-    HAND = 'hand.png'
-
-    def initialize(options = {})
-      options = {
-        image: Gosu::Image[ARROW],
-        rotation_center: :top_left,
-        zorder: Float::INFINITY
-      }.merge!(options)
-
-      super(options)
-
-      nil
-    end
-
-    # Is the mouse pointer position inside the game window pane?
-    def inside_window?
-      x >= 0 and y >= 0 and x < $window.width and y < $window.height
-    end
-
-    def update
-      self.x, self.y = $window.mouse_x, $window.mouse_y
-
-      super
-
-      nil
-    end
-
-    def draw
-      # Prevent system and game mouse from being shown at the same time.
-      super if inside_window? and $window.current_game_state.is_a? GuiState and not $window.needs_cursor?
-    end
-  end
+# encoding: utf-8
+
+module Fidgit
+  class Cursor < Chingu::GameObject
+    ARROW = 'arrow.png'
+    HAND = 'hand.png'
+
+    def initialize(options = {})
+      options = {
+        image: Gosu::Image[ARROW],
+        rotation_center: :top_left,
+        zorder: Float::INFINITY
+      }.merge!(options)
+
+      super(options)
+
+      nil
+    end
+
+    # Is the mouse pointer position inside the game window pane?
+    def inside_window?
+      x >= 0 and y >= 0 and x < $window.width and y < $window.height
+    end
+
+    def update
+      self.x, self.y = $window.mouse_x, $window.mouse_y
+
+      super
+
+      nil
+    end
+
+    def draw
+      # Prevent system and game mouse from being shown at the same time.
+      super if inside_window? and $window.current_game_state.is_a? GuiState and not $window.needs_cursor?
+    end
+  end
 end

data/lib/fidgit/elements/button.rb

@@ -1,113 +1,113 @@
-# encoding: utf-8
-
-module Fidgit
-  class Button < Label
-    # @param (see Label#initialize)
-    # @option (see Label#initialize)
-    # @option options [Symbol] :shortcut (nil) Adds a shortcut key for this element, that activates it. :auto takes the first letter of the text.
-    def initialize(text, options = {}, &block)
-      options = {
-        color: default(:color),
-        background_color: default(:background_color),
-        border_color: default(:border_color),
-        shortcut_color: default(:shortcut_color),
-        shortcut: nil,
-      }.merge! options
-
-      @shortcut_color = options[:shortcut_color].dup
-
-      @shortcut = if options[:shortcut] == :auto
-                    raise ArgumentError.new("Can't use :auto for :shortcut without text") if text.empty?
-                    text[0].downcase.to_sym
-                  else
-                    options[:shortcut]
-                  end
-
-      raise ArgumentError.new(":shortcut must be a symbol") unless @shortcut.nil? or @shortcut.is_a? Symbol
-
-      super(text, options)
-
-      self.text = text # Force shortcut to be written out properly.
-
-      update_colors
-    end
-
-    def text=(value)
-      if @shortcut
-        super value.sub(/#{Regexp.escape @shortcut}/i) {|char| "<c=#{@shortcut_color.to_hex}>#{char}</c>" }
-      else
-        super value
-      end
-    end
-
-    def parent=(value)
-      if @shortcut
-        state = $window.game_state_manager.inside_state || $window.current_game_state
-        if parent
-          raise ArgumentError.new("Repeat of shortcut #{@shortcut.inspect}") if state.input.has_key? @shortcut
-          state.on_input(@shortcut) { activate unless state.focus }
-        else
-          state.input.delete @shortcut
-        end
-      end
-
-      super(value)
-    end
-
-    def clicked_left_mouse_button(sender, x, y)
-      # TODO: Play click sound?
-      nil
-    end
-
-    def enabled=(value)
-      super(value)
-      update_colors
-
-      value
-    end
-
-    def enter(sender)
-      @mouse_over = true
-      update_colors
-
-      nil
-    end
-
-    def leave(sender)
-      @mouse_over = false
-      update_colors
-
-      nil
-    end
-
-    protected
-    def update_colors
-      [:color, :background_color].each do |attribute|
-        send :"#{attribute.to_s}=", enabled? ? default(attribute) : default(:disabled, attribute)
-      end
-
-      self.background_color = if @mouse_over and enabled?
-                                default(:hover, :background_color)
-                              else
-                                default(:background_color)
-                              end
-
-      @icon.enabled = enabled? if @icon
-
-      nil
-    end
-
-    protected
-    # A block added to any button subscribes to LMB click.
-    def post_init_block(&block)
-      subscribe :clicked_left_mouse_button, &block
-    end
-
-    public
-    # Activate the button, as though it had been clicked on.
-    # Does not do anything if the button is disabled.
-    def activate
-      publish(:clicked_left_mouse_button, x + width / 2, y + height / 2) if enabled?
-    end
-  end
+# encoding: utf-8
+
+module Fidgit
+  class Button < Label
+    # @param (see Label#initialize)
+    # @option (see Label#initialize)
+    # @option options [Symbol] :shortcut (nil) Adds a shortcut key for this element, that activates it. :auto takes the first letter of the text.
+    def initialize(text, options = {}, &block)
+      options = {
+        color: default(:color),
+        background_color: default(:background_color),
+        border_color: default(:border_color),
+        shortcut_color: default(:shortcut_color),
+        shortcut: nil,
+      }.merge! options
+
+      @shortcut_color = options[:shortcut_color].dup
+
+      @shortcut = if options[:shortcut] == :auto
+                    raise ArgumentError.new("Can't use :auto for :shortcut without text") if text.empty?
+                    text[0].downcase.to_sym
+                  else
+                    options[:shortcut]
+                  end
+
+      raise ArgumentError.new(":shortcut must be a symbol") unless @shortcut.nil? or @shortcut.is_a? Symbol
+
+      super(text, options)
+
+      self.text = text # Force shortcut to be written out properly.
+
+      update_colors
+    end
+
+    def text=(value)
+      if @shortcut
+        super value.sub(/#{Regexp.escape @shortcut}/i) {|char| "<c=#{@shortcut_color.to_hex}>#{char}</c>" }
+      else
+        super value
+      end
+    end
+
+    def parent=(value)
+      if @shortcut
+        state = $window.game_state_manager.inside_state || $window.current_game_state
+        if parent
+          raise ArgumentError.new("Repeat of shortcut #{@shortcut.inspect}") if state.input.has_key? @shortcut
+          state.on_input(@shortcut) { activate unless state.focus }
+        else
+          state.input.delete @shortcut
+        end
+      end
+
+      super(value)
+    end
+
+    def clicked_left_mouse_button(sender, x, y)
+      # TODO: Play click sound?
+      nil
+    end
+
+    def enabled=(value)
+      super(value)
+      update_colors
+
+      value
+    end
+
+    def enter(sender)
+      @mouse_over = true
+      update_colors
+
+      nil
+    end
+
+    def leave(sender)
+      @mouse_over = false
+      update_colors
+
+      nil
+    end
+
+    protected
+    def update_colors
+      [:color, :background_color].each do |attribute|
+        send :"#{attribute.to_s}=", enabled? ? default(attribute) : default(:disabled, attribute)
+      end
+
+      self.background_color = if @mouse_over and enabled?
+                                default(:hover, :background_color)
+                              else
+                                default(:background_color)
+                              end
+
+      @icon.enabled = enabled? if @icon
+
+      nil
+    end
+
+    protected
+    # A block added to any button subscribes to LMB click.
+    def post_init_block(&block)
+      subscribe :clicked_left_mouse_button, &block
+    end
+
+    public
+    # Activate the button, as though it had been clicked on.
+    # Does not do anything if the button is disabled.
+    def activate
+      publish(:clicked_left_mouse_button, x + width / 2, y + height / 2) if enabled?
+    end
+  end
 end