Added border_fill_middle attribute to ImageDescription.

[redact.git] / lib / redact / part.rb

diff --git a/lib/redact/part.rb b/lib/redact/part.rb
index c6ce88dcd497e0c24b81511896886e7b2a0544d4..974a6bec8ba47d8bc7720039582b2541e56ad61a 100644 (file)
--- a/lib/redact/part.rb
+++ b/lib/redact/part.rb
@@ -1,5 +1,5 @@
 #--
-# $Id: part.rb 21 2005-04-02 22:26:40Z tilman $
+# $Id: part.rb 29 2005-04-16 15:59:07Z tilman $
 #
 # Copyright (c) 2005 Tilman Sauerbeck (tilman at code-monkey de)
 #
@@ -31,8 +31,8 @@ module Redact
 
                include Comparable
 
-               attr_reader :collection, :id, :name, :dragable, :clip
-               attr_accessor :mouse_events, :repeat_events
+               attr_reader :collection, :id, :name, :dragable, :clip,
+                           :mouse_events, :repeat_events
 
                def initialize(collection, id, name)
                        @collection = collection
@@ -57,6 +57,14 @@ module Redact
                        @id <=> b.id
                end
 
+               def mouse_events=(val)
+                       @mouse_events = (val == true)
+               end
+
+               def repeat_events=(val)
+                       @repeat_events = (val == true)
+               end
+
                def clip=(part)
                        if part == self
                                raise(ArgumentError, "cannot clip part to itself")
@@ -213,8 +221,8 @@ module Redact
        end
 
        class Description
-               attr_reader :rel, :aspect, :step
-               attr_accessor :visible, :aspect_preference, :color_class
+               attr_reader :rel, :aspect, :step, :visible, :color_class
+               attr_accessor :aspect_preference
 
                def initialize(name = "default", value = 0.0)
                        @name = name.to_str.dup.freeze
@@ -231,6 +239,14 @@ module Redact
                        @color_class = ""
                end
 
+               def visible=(v)
+                       @visible = (v == true)
+               end
+
+               def color_class=(v)
+                       @color_class = v.to_str.dup
+               end
+
                def set_step(x = 0, y = 0)
                        @step = [x, y]
                end
@@ -277,27 +293,21 @@ module Redact
                        pairs.map { |p| p.hex }
                end
 
-               def map_aspect_preference
-                       case @aspect_preference
-                       when :none
-                               0
-                       when :vertical
-                               1
-                       when :horizontal
-                               2
-                       when :both
-                               3
-                       else
-                               raise(RedactError, "invalid aspect preference value - " +
-                                     @aspect_preference.to_s)
-                       end
-               end
-
                def to_eet_name
                        "Edje_Part_Description"
                end
 
                def to_eet_properties
+                       asp_pref = case @aspect_preference
+                       when :none: 0
+                       when :vertical: 1
+                       when :horizontal: 2
+                       when :both: 3
+                       else
+                               raise(RedactError, "invalid aspect preference value - " +
+                                     @aspect_preference.to_s)
+                       end
+
                        {"state.name" => [@name],
                         "state.value" => [@value, :double],
                         "visible" => [@visible],
@@ -311,7 +321,7 @@ module Redact
                         "step.y" => [@step[1]],
                         "aspect.min" => [@aspect[0], :double],
                         "aspect.max" => [@aspect[1], :double],
-                        "aspect.prefer" => [map_aspect_preference, :char],
+                        "aspect.prefer" => [asp_pref, :char],
                         "rel1.relative_x" => [@rel[0].rel[0], :double],
                         "rel1.relative_y" => [@rel[0].rel[1], :double],
                         "rel1.offset_x" => [@rel[0].offset[0]],
@@ -337,6 +347,7 @@ module Redact
                         "border.r" => [0],
                         "border.t" => [0],
                         "border.b" => [0],
+                        "border.no_fill" => [false],
                         "fill.smooth" => [true],
                         "fill.pos_rel_x" => [0.0, :double],
                         "fill.pos_abs_x" => [0],
@@ -376,6 +387,7 @@ module Redact
                        @id = image.id
                end
 
+               protected
                def to_eet_name
                        "Edje_Part_Image_Id"
                end
@@ -394,7 +406,7 @@ module Redact
        end
 
        class ImageDescription < Description
-               attr_reader :image, :auto_rel, :tweens
+               attr_reader :image, :auto_rel, :tweens, :border_fill_middle
 
                def initialize(name = "default", value = 0.0)
                        super
@@ -402,10 +414,15 @@ module Redact
                        @image = nil
                        @tweens = Tweens.new
                        @border = [0, 0, 0, 0]
+                       @border_fill_middle = true
                        @fill_smooth = true
                        @auto_rel = false
                end
 
+               def border_fill_middle=(var)
+                       @border_fill_middle = (var == true)
+               end
+
                def image=(im)
                        return if !@image.nil? && im == @image.filename
 
@@ -434,6 +451,7 @@ module Redact
                        @border = [r, r, t, b]
                end
 
+               protected
                def to_eet_properties
                        super.merge!(
                        {"image.id" => [@image.nil? ? -1 : @image.id],
@@ -442,6 +460,7 @@ module Redact
                         "border.r" => [@border[1]],
                         "border.t" => [@border[2]],
                         "border.b" => [@border[3]],
+                        "border.no_fill" => [!@border_fill_middle],
                         "fill.smooth" => [@fill_smooth],
                         "fill.pos_rel_x" => [0.0, :double],
                         "fill.pos_abs_x" => [0],
@@ -455,8 +474,7 @@ module Redact
        end
 
        class TextDescription < Description
-               attr_reader :font
-               attr_accessor :text, :font_size, :text_class
+               attr_reader :font, :text, :font_size, :text_class
 
                def initialize(name = "default", value = 0.0)
                        super
@@ -474,6 +492,18 @@ module Redact
                        @text_id_text_source = -1
                end
 
+               def text=(v)
+                       @text = v.to_str.dup
+               end
+
+               def font_size=(v)
+                       @font_size = v.to_int
+               end
+
+               def text_class=(v)
+                       @text_class = v.to_str.dup
+               end
+
                def set_fit(x = false, y = false)
                        @fit = [x, y]
                end
@@ -487,7 +517,8 @@ module Redact
                end
 
                def font=(f)
-                       md = f.to_str.match(/.*\.ttf/)
+                       f = f.to_str.strip
+                       md = f.match(/.*\.ttf$/)
                        unless md.nil?
                                found = EDJE.font_dir.find { |font| font.filename == f }
                                if found.nil?
@@ -495,7 +526,7 @@ module Redact
                                end
                        end
 
-                       @font = f.dup
+                       @font = f
                end
 
                def outline_color=(c)
@@ -506,6 +537,7 @@ module Redact
                        @shadow_color = parse_hex_color(c)
                end
 
+               protected
                def to_eet_properties
                        super.merge!(
                        {"color2.r" => [@outline_color[0], :char],