From: Charlie Brej <cbrej@cs.man.ac.uk>
Date: Sun, 29 Nov 2009 02:51:10 +0000 (+0000)
Subject: [script] Pass color to the text renderer
X-Git-Tag: 0.8.0~92
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=69deaaa30a472f10101977e98a292b2e007a296d;p=thirdparty%2Fplymouth.git

[script] Pass color to the text renderer

We collected the color information before, but did nothing with it.
---

diff --git a/src/plugins/splash/script/script-lib-image.c b/src/plugins/splash/script/script-lib-image.c
index 1abae268..15bfe879 100644
--- a/src/plugins/splash/script/script-lib-image.c
+++ b/src/plugins/splash/script/script-lib-image.c
@@ -163,14 +163,15 @@ static script_return_t image_text (script_state_t *state,
   char *text = script_obj_hash_get_string (state->local, "text");
   
   /* These colour values are currently unused, but will be once label supports them */
-  float red = script_obj_hash_get_number (state->local, "red");
-  float green = script_obj_hash_get_number (state->local, "green");
-  float blue = script_obj_hash_get_number (state->local, "blue");
+  float red = CLAMP(script_obj_hash_get_number (state->local, "red"), 0, 1);
+  float green = CLAMP(script_obj_hash_get_number (state->local, "green"), 0, 1);
+  float blue = CLAMP(script_obj_hash_get_number (state->local, "blue"), 0, 1);
   
   if (!text) return script_return_obj_null ();
   
   label = ply_label_new ();
   ply_label_set_text (label, text);
+  ply_label_set_color (label, red, green, blue, 1.0);
   ply_label_show (label, NULL, 0, 0);
   
   width = ply_label_get_width (label);