fidgit 0.2.4 → 0.2.5

data/lib/fidgit/elements/packer.rb

@@ -1,42 +1,42 @@
-# encoding: utf-8
-
-module Fidgit
-  # Container that auto-packs elements.
-  #
-  # @abstract
-  class Packer < Container
-    attr_reader :spacing_h, :spacing_v
-
-    # @param (see Container#initialize)
-    #
-    # @option (see Container#initialize)
-    def initialize(options = {})
-      options = {
-      }.merge! options
-
-      @spacing_h = options[:spacing_h] || options[:spacing] || default(:spacing_h)
-      @spacing_v = options[:spacing_v] || options[:spacing] || default(:spacing_v)
-
-      super(options)
-    end
-
-    protected
-    # Recalculate the size of the container.
-    # Should be overridden by any descendant that manages the positions of its children.
-    def layout
-      # This assumes that the container overlaps all the children.
-
-      # Move all children if we have moved.
-      @children.each.with_index do |child, index|
-        child.x = padding_left + x
-        child.y = padding_top + y
-      end
-
-      # Make us as wrap around the largest child.
-      rect.width = (@children.map {|c| c.width }.max || 0) + padding_left + padding_right
-      rect.height = (@children.map {|c| c.height }.max || 0) + padding_top + padding_bottom
-
-      super
-    end
-  end
+# encoding: utf-8
+
+module Fidgit
+  # Container that auto-packs elements.
+  #
+  # @abstract
+  class Packer < Container
+    attr_reader :spacing_h, :spacing_v
+
+    # @param (see Container#initialize)
+    #
+    # @option (see Container#initialize)
+    def initialize(options = {})
+      options = {
+      }.merge! options
+
+      @spacing_h = options[:spacing_h] || options[:spacing] || default(:spacing_h)
+      @spacing_v = options[:spacing_v] || options[:spacing] || default(:spacing_v)
+
+      super(options)
+    end
+
+    protected
+    # Recalculate the size of the container.
+    # Should be overridden by any descendant that manages the positions of its children.
+    def layout
+      # This assumes that the container overlaps all the children.
+
+      # Move all children if we have moved.
+      @children.each.with_index do |child, index|
+        child.x = padding_left + x
+        child.y = padding_top + y
+      end
+
+      # Make us as wrap around the largest child.
+      rect.width = (@children.map {|c| c.width }.max || 0) + padding_left + padding_right
+      rect.height = (@children.map {|c| c.height }.max || 0) + padding_top + padding_bottom
+
+      super
+    end
+  end
 end

data/lib/fidgit/elements/radio_button.rb

@@ -1,86 +1,86 @@
-# encoding: utf-8
-
-module Fidgit
-  class RadioButton < Button
-    attr_reader :group, :value
-
-    event :changed
-
-    def checked?; @checked; end
-
-    # @param (see Button#initialize)
-    # @param [Object] value
-    #
-    # @option (see Button#initialize)
-    # @option options [Boolean] :checked
-    def initialize(text, value, options = {}, &block)
-      options = {
-        checked: false,
-        checked_border_color: default(:checked, :border_color),
-      }.merge! options
-
-      @checked = options[:checked]
-      @value = value
-
-      super(text, options)
-
-      @checked_border_color = options[:checked_border_color].dup
-      @unchecked_border_color = border_color
-      add_to_group
-
-      @border_color = (checked? ? @checked_border_color : @unchecked_border_color).dup
-    end
-
-    def clicked_left_mouse_button(sender, x, y)
-      super
-      check
-      nil
-    end
-
-    # Check the button and update its group. This may uncheck another button in the group if one is selected.
-    def check
-      return if checked?
-
-      @checked = true
-      @group.value = value
-      @border_color = @checked_border_color.dup
-      publish :changed, @checked
-
-      nil
-    end
-
-    # Uncheck the button and update its group.
-    def uncheck
-      return unless checked?
-
-      @checked = false
-      @group.value = value
-      @border_color = @unchecked_border_color.dup
-      publish :changed, @checked
-
-      nil
-    end
-
-    protected
-    def parent=(parent)
-      @group.remove_button self if @parent
-      super(parent)
-      add_to_group if parent
-      parent
-    end
-
-    protected
-    def add_to_group
-      container = parent
-      while container and not container.is_a? Group
-        container = container.parent
-      end
-
-      raise "#{self.class.name} must be placed inside a group element" unless container
-
-      @group = container
-      @group.add_button self
-      nil
-    end
-  end
+# encoding: utf-8
+
+module Fidgit
+  class RadioButton < Button
+    attr_reader :group, :value
+
+    event :changed
+
+    def checked?; @checked; end
+
+    # @param (see Button#initialize)
+    # @param [Object] value
+    #
+    # @option (see Button#initialize)
+    # @option options [Boolean] :checked
+    def initialize(text, value, options = {}, &block)
+      options = {
+        checked: false,
+        checked_border_color: default(:checked, :border_color),
+      }.merge! options
+
+      @checked = options[:checked]
+      @value = value
+
+      super(text, options)
+
+      @checked_border_color = options[:checked_border_color].dup
+      @unchecked_border_color = border_color
+      add_to_group
+
+      @border_color = (checked? ? @checked_border_color : @unchecked_border_color).dup
+    end
+
+    def clicked_left_mouse_button(sender, x, y)
+      super
+      check
+      nil
+    end
+
+    # Check the button and update its group. This may uncheck another button in the group if one is selected.
+    def check
+      return if checked?
+
+      @checked = true
+      @group.value = value
+      @border_color = @checked_border_color.dup
+      publish :changed, @checked
+
+      nil
+    end
+
+    # Uncheck the button and update its group.
+    def uncheck
+      return unless checked?
+
+      @checked = false
+      @group.value = value
+      @border_color = @unchecked_border_color.dup
+      publish :changed, @checked
+
+      nil
+    end
+
+    protected
+    def parent=(parent)
+      @group.remove_button self if @parent
+      super(parent)
+      add_to_group if parent
+      parent
+    end
+
+    protected
+    def add_to_group
+      container = parent
+      while container and not container.is_a? Group
+        container = container.parent
+      end
+
+      raise "#{self.class.name} must be placed inside a group element" unless container
+
+      @group = container
+      @group.add_button self
+      nil
+    end
+  end
 end

data/lib/fidgit/elements/scroll_area.rb

@@ -1,68 +1,68 @@
-# encoding: utf-8
-
-module Fidgit
-  # A basic scrolling area. It is not managed in any way (use ScrollWindow for that).
-  class ScrollArea < Container
-    # @return [Vertical] The content shown within this ScrollArea
-    attr_reader :content
-
-    def offset_x; x - @content.x; end
-    def offset_y; y - @content.y; end
-
-    def offset_x=(value)
-      @content.x = x - [[@content.width - width, value].min, 0].max
-    end
-
-    def offset_y=(value)
-      @content.y = y - [[@content.height - height, value].min, 0].max
-    end
-
-    # @option options [Number] :offset (0)
-    # @option options [Number] :offset_x (value of :offset option)
-    # @option options [Number] :offset_y (value of :offset option)
-    # @option options [Element] :owner The owner of the content, such as the scroll-window containing the content.
-    def initialize(options = {})
-      options = {
-        offset: 0,
-        owner: nil,
-      }.merge! options
-
-      @owner = options[:owner]
-
-      super(options)
-
-      @content = Vertical.new(parent: self, padding: 0)
-
-      self.offset_x = options[:offset_x] || options[:offset]
-      self.offset_y = options[:offset_y] || options[:offset]
-    end
-
-    def hit_element(x, y)
-      # Only pass on mouse events if they are inside the window.
-      if hit?(x, y)
-        @content.hit_element(x, y) || self
-      else
-        nil
-      end
-    end
-
-    def recalc
-      super
-      # Always recalc our owner if our content resizes, even though our size can't change even if the content changes
-      # (may encourage ScrollWindow to show/hide scroll-bars, for example)
-      @owner.recalc if @owner
-    end
-
-    protected
-    def draw_foreground
-      $window.clip_to(*rect) do
-        @content.draw
-      end
-    end
-
-    protected
-    def post_init_block(&block)
-      with(&block)
-    end
-  end
+# encoding: utf-8
+
+module Fidgit
+  # A basic scrolling area. It is not managed in any way (use ScrollWindow for that).
+  class ScrollArea < Container
+    # @return [Vertical] The content shown within this ScrollArea
+    attr_reader :content
+
+    def offset_x; x - @content.x; end
+    def offset_y; y - @content.y; end
+
+    def offset_x=(value)
+      @content.x = x - [[@content.width - width, value].min, 0].max
+    end
+
+    def offset_y=(value)
+      @content.y = y - [[@content.height - height, value].min, 0].max
+    end
+
+    # @option options [Number] :offset (0)
+    # @option options [Number] :offset_x (value of :offset option)
+    # @option options [Number] :offset_y (value of :offset option)
+    # @option options [Element] :owner The owner of the content, such as the scroll-window containing the content.
+    def initialize(options = {})
+      options = {
+        offset: 0,
+        owner: nil,
+      }.merge! options
+
+      @owner = options[:owner]
+
+      super(options)
+
+      @content = Vertical.new(parent: self, padding: 0)
+
+      self.offset_x = options[:offset_x] || options[:offset]
+      self.offset_y = options[:offset_y] || options[:offset]
+    end
+
+    def hit_element(x, y)
+      # Only pass on mouse events if they are inside the window.
+      if hit?(x, y)
+        @content.hit_element(x, y) || self
+      else
+        nil
+      end
+    end
+
+    def recalc
+      super
+      # Always recalc our owner if our content resizes, even though our size can't change even if the content changes
+      # (may encourage ScrollWindow to show/hide scroll-bars, for example)
+      @owner.recalc if @owner
+    end
+
+    protected
+    def draw_foreground
+      $window.clip_to(*rect) do
+        @content.draw
+      end
+    end
+
+    protected
+    def post_init_block(&block)
+      with(&block)
+    end
+  end
 end

data/lib/fidgit/elements/scroll_bar.rb

@@ -1,128 +1,128 @@
-# encoding: utf-8
-
-module Fidgit
-  # @abstract
-  class ScrollBar < Composite
-    class Handle < Element
-      event :begin_drag
-      event :update_drag
-      event :end_drag
-
-      def drag?(button); button == :left; end
-
-      def initialize(options = {})
-        super options
-
-        subscribe :begin_drag do |sender, x, y|
-          # Store position of the handle when it starts to drag.
-          @drag_start_pos = [x - self.x, y - self.y]
-        end
-
-        subscribe :update_drag do |sender, x, y|
-          parent.parent.handle_dragged_to x - @drag_start_pos[0], y - @drag_start_pos[1]
-        end
-
-        subscribe :end_drag do
-          @drag_start_pos = nil
-        end
-      end
-    end
-
-    def initialize(options = {})
-      options = {
-        background_color: default(:background_color),
-        border_color: default(:border_color),
-        rail_width: default(:rail_width),
-        rail_color: default(:rail_color),
-        handle_color: default(:handle_color),
-        owner: nil,
-      }.merge! options
-
-      @owner = options[:owner]
-      @rail_thickness = options[:rail_width]
-      @rail_color = options[:rail_color]
-
-      super options
-
-      @handle_container = Container.new(parent: self, width: options[:width], height: options[:height]) do
-        @handle = Handle.new(parent: self, x: x, y: y, background_color: options[:handle_color])
-      end
-
-      subscribe :left_mouse_button do |sender, x, y|
-        clicked_to_move x, y
-      end
-    end
-  end
-
-  class HorizontalScrollBar < ScrollBar
-    attr_reader :owner
-
-    def initialize(options = {})
-      super options
-
-      @handle.height = height
-
-      @handle_container.subscribe :left_mouse_button do |sender, x, y|
-        distance = @owner.view_width
-        @owner.offset_x += (x > @handle.x)? +distance : -distance
-      end
-    end
-
-    def update
-      window = parent.parent
-
-      # Resize and re-locate the handles based on changes to the scroll-window.
-      content_width = window.content_width.to_f
-      @handle.width = (window.view_width * width) / content_width
-      @handle.x = x + (window.offset_x * width) / content_width
-    end
-
-    def draw_foreground
-      draw_rect x + padding_left, y + (height - @rail_thickness) / 2, width, @rail_thickness, z, @rail_color
-      super
-    end
-
-    def handle_dragged_to(x, y)
-      @owner.offset_x = @owner.content_width * ((x - self.x) / width.to_f)
-    end
-
-    def clicked_to_move(x, y)
-      new_x = x < @handle.x ? @handle.x - @handle.width : @handle.x + @handle.width
-      handle_dragged_to new_x, @handle.y
-    end
-  end
-
-  class VerticalScrollBar < ScrollBar
-    def initialize(options = {})
-      super options
-
-      @handle.width = width
-
-      @handle_container.subscribe :left_mouse_button do |sender, x, y|
-        distance = @owner.view_height
-        @owner.offset_y += (y > @handle.y)? +distance : -distance
-      end
-    end
-
-    def update
-      window = parent.parent
-      content_height = window.content_height.to_f
-      @handle.height = (window.view_height * height) / content_height
-      @handle.y = y + (window.offset_y * height) / content_height
-    end
-
-    def draw_foreground
-      draw_rect x + (width - @rail_thickness) / 2, y + padding_top, @rail_thickness, height, z, @rail_color
-      super
-    end
-
-    def handle_dragged_to(x, y)
-      @owner.offset_y = @owner.content_height * ((y - self.y) / height.to_f)
-    end
-
-    def clicked_to_move(x, y)
-      new_y = y < @handle.y ? @handle.y - @handle.height : @handle.y + @handle.height
-      handle_dragged_to @handle.x, new_y
-    end
-  end
+# encoding: utf-8
+
+module Fidgit
+  # @abstract
+  class ScrollBar < Composite
+    class Handle < Element
+      event :begin_drag
+      event :update_drag
+      event :end_drag
+
+      def drag?(button); button == :left; end
+
+      def initialize(options = {})
+        super options
+
+        subscribe :begin_drag do |sender, x, y|
+          # Store position of the handle when it starts to drag.
+          @drag_start_pos = [x - self.x, y - self.y]
+        end
+
+        subscribe :update_drag do |sender, x, y|
+          parent.parent.handle_dragged_to x - @drag_start_pos[0], y - @drag_start_pos[1]
+        end
+
+        subscribe :end_drag do
+          @drag_start_pos = nil
+        end
+      end
+    end
+
+    def initialize(options = {})
+      options = {
+        background_color: default(:background_color),
+        border_color: default(:border_color),
+        rail_width: default(:rail_width),
+        rail_color: default(:rail_color),
+        handle_color: default(:handle_color),
+        owner: nil,
+      }.merge! options
+
+      @owner = options[:owner]
+      @rail_thickness = options[:rail_width]
+      @rail_color = options[:rail_color]
+
+      super options
+
+      @handle_container = Container.new(parent: self, width: options[:width], height: options[:height]) do
+        @handle = Handle.new(parent: self, x: x, y: y, background_color: options[:handle_color])
+      end
+
+      subscribe :left_mouse_button do |sender, x, y|
+        clicked_to_move x, y
+      end
+    end
+  end
+
+  class HorizontalScrollBar < ScrollBar
+    attr_reader :owner
+
+    def initialize(options = {})
+      super options
+
+      @handle.height = height
+
+      @handle_container.subscribe :left_mouse_button do |sender, x, y|
+        distance = @owner.view_width
+        @owner.offset_x += (x > @handle.x)? +distance : -distance
+      end
+    end
+
+    def update
+      window = parent.parent
+
+      # Resize and re-locate the handles based on changes to the scroll-window.
+      content_width = window.content_width.to_f
+      @handle.width = (window.view_width * width) / content_width
+      @handle.x = x + (window.offset_x * width) / content_width
+    end
+
+    def draw_foreground
+      draw_rect x + padding_left, y + (height - @rail_thickness) / 2, width, @rail_thickness, z, @rail_color
+      super
+    end
+
+    def handle_dragged_to(x, y)
+      @owner.offset_x = @owner.content_width * ((x - self.x) / width.to_f)
+    end
+
+    def clicked_to_move(x, y)
+      new_x = x < @handle.x ? @handle.x - @handle.width : @handle.x + @handle.width
+      handle_dragged_to new_x, @handle.y
+    end
+  end
+
+  class VerticalScrollBar < ScrollBar
+    def initialize(options = {})
+      super options
+
+      @handle.width = width
+
+      @handle_container.subscribe :left_mouse_button do |sender, x, y|
+        distance = @owner.view_height
+        @owner.offset_y += (y > @handle.y)? +distance : -distance
+      end
+    end
+
+    def update
+      window = parent.parent
+      content_height = window.content_height.to_f
+      @handle.height = (window.view_height * height) / content_height
+      @handle.y = y + (window.offset_y * height) / content_height
+    end
+
+    def draw_foreground
+      draw_rect x + (width - @rail_thickness) / 2, y + padding_top, @rail_thickness, height, z, @rail_color
+      super
+    end
+
+    def handle_dragged_to(x, y)
+      @owner.offset_y = @owner.content_height * ((y - self.y) / height.to_f)
+    end
+
+    def clicked_to_move(x, y)
+      new_y = y < @handle.y ? @handle.y - @handle.height : @handle.y + @handle.height
+      handle_dragged_to @handle.x, new_y
+    end
+  end
 end