From: Charlie Brej <cbrej@cs.man.ac.uk>
Date: Tue, 17 Nov 2009 22:46:32 +0000 (+0000)
Subject: [label] Operate with display set to NULL
X-Git-Tag: 0.8.0~138
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8debba60b0766e4c0eda37a0302dcd3b3cbcd181;p=thirdparty%2Fplymouth.git

[label] Operate with display set to NULL

Performing a ply_label_show with the display set to NULL allows the label to be
drawn any pixel buffer and not perform any redraw events.
---

diff --git a/src/plugins/controls/label/plugin.c b/src/plugins/controls/label/plugin.c
index 5f1d1679..4e053fd1 100644
--- a/src/plugins/controls/label/plugin.c
+++ b/src/plugins/controls/label/plugin.c
@@ -221,7 +221,7 @@ set_text_for_control (ply_label_plugin_control_t *label,
       free (label->text);
       label->text = strdup (text);
       size_control (label);
-      if (!label->is_hidden)
+      if (!label->is_hidden && label->display != NULL)
         ply_pixel_display_draw_area (label->display,
                                      dirty_area.x, dirty_area.y,
                                      dirty_area.width, dirty_area.height);
@@ -246,7 +246,7 @@ show_control (ply_label_plugin_control_t *label,
 
   size_control (label);
 
-  if (!label->is_hidden)
+  if (!label->is_hidden && label->display != NULL)
     ply_pixel_display_draw_area (label->display,
                                  dirty_area.x, dirty_area.y,
                                  dirty_area.width, dirty_area.height);
@@ -260,9 +260,10 @@ void
 hide_control (ply_label_plugin_control_t *label)
 {
   label->is_hidden = true;
-  ply_pixel_display_draw_area (label->display,
-                               label->area.x, label->area.y,
-                               label->area.width, label->area.height);
+  if (label->display != NULL)
+    ply_pixel_display_draw_area (label->display,
+                                 label->area.x, label->area.y,
+                                 label->area.width, label->area.height);
 
   label->display = NULL;
   label->loop = NULL;