X-Git-Url: http://git.code-monkey.de/?p=redact.git;a=blobdiff_plain;f=lib%2Fredact%2Fpart.rb;h=60822d11402f70ea7b4f879db24f3adf44d5c31d;hp=c9dc87f16e81e3645ebfa2aea37073fe46538ab4;hb=5509b434e26fd1a8c9c3990154a881583b81d2a6;hpb=5fd2488078da036c8920953d9d1f6ddead3c93c1

diff --git a/lib/redact/part.rb b/lib/redact/part.rb
index c9dc87f..60822d1 100644
--- a/lib/redact/part.rb
+++ b/lib/redact/part.rb
@@ -1,6 +1,4 @@
 #--
-# $Id: part.rb 49 2005-06-09 17:21:05Z tilman $
-#
 # Copyright (c) 2005 Tilman Sauerbeck (tilman at code-monkey de)
 #
 # Permission is hereby granted, free of charge, to any person obtaining
@@ -112,6 +110,7 @@ module Redact
 			 "dragable.y" => [@dragable.enabled[1], :char],
 			 "dragable.step_y" => [@dragable.step[1]],
 			 "dragable.count_y" => [@dragable.count[1]],
+			 "dragable.events_id" => [-1],
 			 "dragable.counfine_id" => [confine_id]} # not a typo!
 		end
 
@@ -202,13 +201,13 @@ module Redact
 		attr_reader :rel, :to_id, :offset
 
 		def initialize(rel, offset)
-			@rel = [rel, rel]
+			@rel = [rel.to_f, rel.to_f]
 			@to_id = [-1, -1]
 			@offset = [offset, offset]
 		end
 
 		def set_rel(x, y)
-			@rel = [x, y]
+			@rel = [x.to_f, y.to_f]
 		end
 
 		def set_offset(x, y)
@@ -244,6 +243,20 @@ module Redact
 			@color_class = ""
 		end
 
+		def inherit(other)
+			unless other.is_a?(Description)
+				raise(ArgumentError, "Cannot inherit from description")
+			end
+
+			prot = ["@name", "@value"]
+
+			(instance_variables - prot).each do |v|
+				n = other.instance_variable_get(v.intern)
+				n = n.dup rescue n
+				instance_variable_set(v.intern, n)
+			end
+		end
+
 		def visible=(v)
 			@visible = (v == true)
 		end
@@ -425,7 +438,9 @@ module Redact
 	end
 
 	class ImageDescription < Description
-		attr_reader :image, :auto_rel, :tweens, :border_fill_middle
+		attr_reader :image, :auto_rel, :tweens, :border_fill_middle,
+		            :fill_smooth, :fill_pos_rel, :fill_pos_abs,
+		            :fill_rel, :fill_abs
 
 		def initialize(name = "default", value = 0.0)
 			super
@@ -434,7 +449,13 @@ module Redact
 			@tweens = Tweens.new
 			@border = [0, 0, 0, 0]
 			@border_fill_middle = true
+
 			@fill_smooth = true
+			@fill_pos_rel = [0.0, 0.0]
+			@fill_pos_abs = [0, 0]
+			@fill_rel = [1.0, 1.0]
+			@fill_abs = [0, 0]
+
 			@auto_rel = false
 		end
 
@@ -470,7 +491,27 @@ module Redact
 		end
 
 		def set_border(l = 0, r = 0, t = 0, b = 0)
-			@border = [r, r, t, b]
+			@border = [l, r, t, b]
+		end
+
+		def fill_smooth=(v)
+			@fill_smooth = (v == true)
+		end
+
+		def set_fill_pos_rel(x, y)
+			@fill_pos_rel = [x.to_f, y.to_f]
+		end
+
+		def set_fill_pos_abs(x, y)
+			@fill_pos_abs = [x.to_i, y.to_i]
+		end
+
+		def set_fill_rel(x, y)
+			@fill_rel = [x.to_f, y.to_f]
+		end
+
+		def set_fill_abs(x, y)
+			@fill_abs = [x.to_i, y.to_i]
 		end
 
 		protected
@@ -484,14 +525,14 @@ module Redact
 			 "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],
-			 "fill.rel_x" => [1.0, :double],
-			 "fill.abs_x" => [0],
-			 "fill.pos_rel_y" => [0.0, :double],
-			 "fill.pos_abs_y" => [0],
-			 "fill.rel_y" => [1.0, :double],
-			 "fill.abs_y" => [0]})
+			 "fill.pos_rel_x" => [@fill_pos_rel[0], :double],
+			 "fill.pos_abs_x" => [@fill_pos_abs[0]],
+			 "fill.rel_x" => [@fill_rel[0], :double],
+			 "fill.abs_x" => [@fill_abs[0]],
+			 "fill.pos_rel_y" => [@fill_pos_rel[1], :double],
+			 "fill.pos_abs_y" => [@fill_pos_abs[1]],
+			 "fill.rel_y" => [@fill_rel[1], :double],
+			 "fill.abs_y" => [@fill_abs[1]]})
 		end
 
 		private