lib/savio/InputBox.rb in savio-0.1.2 vs lib/savio/InputBox.rb in savio-0.1.3

@@ -24,13 +24,16 @@
       @displayName = @value
 
       @length = args[:length] || @size * 10
       @height = args[:height] || @size * 1.2
 
-      @color = args[:color] || 'gray'
-      @activeColor = args[:activeColor] || 'green'
+      @color = args[:color] || '#F5F5F5'
+      @activeColor = args[:activeColor] || '#5BB36A'
 
+      @activeTextColor = args[:activeTextColor] || '#F5F5F5'
+      @inactiveTextColor = args[:inactiveTextColor] || '#757575'
+
       build()
     end
 
     def remove()
       super()
@@ -50,10 +53,18 @@
     end
     def activeColor=(color)
       @activeColor = color
       rebuild()
     end
+    def activeTextcolor=(color)
+      @activeTextcolor = color
+      rebuild()
+    end
+    def inactiveTextColor=(color)
+      @inactiveTextColor = color
+      rebuild()
+    end
     def length=(length)
       @length = length
       rebuild()
     end
     def height=(height)
@@ -112,10 +123,11 @@
       if @value == @displayName
         @value = ""
       end
 
       @display.text = @value + "|"
+      @display.color = @activeTextColor
       @container.color = @activeColor
     end
 
     def deselect()
       @selected = false
@@ -123,10 +135,11 @@
       if @value == ""
         @value = @displayName
       end
 
       @display.text = @value
+      @display.color = @inactiveTextColor
       @container.color = @color
     end
 
     def toggle()
       if @selected
@@ -137,10 +150,14 @@
     end
 
     def build()
       @shown = true
 
-      @display = Text.new(@value,x: @x,y: @y,z: @z + 1, size: @size)
+      @display = Text.new(@value,x: @x,y: @y,z: @z + 1, size: @size, color: @inactiveTextColor)
+      @height = @display.height * 1.1
+
       @container = Rectangle.new(x: @x, y: @y, z: @z, height: @height, width: @length, color: @color)
+
+      @display.y = @container.y + @container.height / 2 - @display.height / 2
     end
   end
 end