fidgit 0.0.4alpha → 0.0.5alpha

data/config/default_schema.yml

@@ -101,6 +101,7 @@
     :height: ?scroll_bar_thickness
 
   :Label: # < Element
+    :justify: :left
     :disabled:
       :color: ?light_gray
 

data/examples/label_example.rb

@@ -11,6 +11,12 @@ class ExampleState < Fidgit::GuiState
       label '', icon: Gosu::Image["head_icon.png"], tip: 'A label with just icon'
       label '', background_color: Gosu::Color.rgb(0, 255, 0), tip: 'No text or icon'
     end
+
+    pack :vertical do
+      label ":left justification", width: 400, background_color: Gosu::Color.rgb(0, 100, 0), justify: :left, tip: 'A label with text'
+      label ":right justification", width: 400, background_color: Gosu::Color.rgb(0, 100, 0), justify: :right, tip: 'A label with text'
+      label ":center justification", width: 400, background_color: Gosu::Color.rgb(0, 100, 0), justify: :center, tip: 'A label with text'
+    end
   end
 end
 

data/lib/fidgit/elements/combo_box.rb

@@ -10,7 +10,9 @@ class ComboBox < Button
   def value=(value)
     if @value != value
       @value = value
-      @text = @menu.find(@value).text
+      item = @menu.find(@value)
+      self.text = item.text
+      self.icon = item.icon
       publish :changed, @value
     end
 

data/lib/fidgit/elements/label.rb

@@ -5,6 +5,8 @@ module Fidgit
     attr_accessor :color, :background_color, :border_color
     attr_reader :text, :icon
 
+    VALID_JUSTIFICATION = [:left, :right, :center]
+
     def text=(value)
       @text = value
       recalc
@@ -22,9 +24,11 @@ module Fidgit
     #
     # @option (see Element#initialize)
     # @option options [Fidgit::Thumbnail, Gosu::Image, nil] :icon (nil)
+    # @option options [:left, :right, :center] :justify (:left) Text justification.
     def initialize(text, options = {})
       options = {
         color: default(:color),
+        justify: default(:justify),
         background_color: default(:background_color),
         border_color: default(:border_color),
       }.merge! options
@@ -33,6 +37,9 @@ module Fidgit
       @icon = options[:icon]
       @color = options[:color].dup
 
+      raise "Justification must be one of #{VALID_JUSTIFICATION.inspect}" unless VALID_JUSTIFICATION.include? options[:justify]
+      @justify = options[:justify]
+
       super(options)
     end
 
@@ -44,7 +51,21 @@ module Fidgit
       end
 
       unless @text.empty?
-        font.draw(@text, current_x, y + padding_top, z, 1, 1, @color)
+        case @justify
+          when :left
+            rel_x = 0.0
+            center_x = current_x
+
+          when :right
+            rel_x = 1.0
+            center_x = x + rect.width - padding_right
+
+          when :center
+            rel_x = 0.5
+            center_x = (current_x + x + rect.width - padding_right) / 2.0
+        end
+
+        font.draw_rel(@text, center_x, y + padding_top, z, rel_x, 0, 1, 1, @color)
       end
 
       nil

data/lib/fidgit/version.rb

@@ -1,5 +1,5 @@
 # encoding: UTF-8
 
 module Fidgit
-  VERSION = '0.0.4alpha'
+  VERSION = '0.0.5alpha'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fidgit
 version: !ruby/object:Gem::Version
-  version: 0.0.4alpha
+  version: 0.0.5alpha
   prerelease: 5
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-03-23 00:00:00.000000000 +00:00
+date: 2011-03-25 00:00:00.000000000 +00:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gosu
-  requirement: &26488260 !ruby/object:Gem::Requirement
+  requirement: &26622144 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 0.7.28
   type: :runtime
   prerelease: false
-  version_requirements: *26488260
+  version_requirements: *26622144
 - !ruby/object:Gem::Dependency
   name: chingu
-  requirement: &26479692 !ruby/object:Gem::Requirement
+  requirement: &26621748 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 0.9rc4
   type: :runtime
   prerelease: false
-  version_requirements: *26479692
+  version_requirements: *26621748
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &26479404 !ruby/object:Gem::Requirement
+  requirement: &26621364 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 2.1.0
   type: :development
   prerelease: false
-  version_requirements: *26479404
+  version_requirements: *26621364
 - !ruby/object:Gem::Dependency
   name: texplay
-  requirement: &26479128 !ruby/object:Gem::Requirement
+  requirement: &26621016 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,7 +55,7 @@ dependencies:
         version: 0.3.5
   type: :development
   prerelease: false
-  version_requirements: *26479128
+  version_requirements: *26621016
 description: Fidgit is a GUI library built on Gosu/Chingu
 email:
 - bil.bagpuss@gmail.com