r7328 - dumbhippo/trunk/client/common/stacker

[commits mugshot org]

Author: otaylor
Date: 2008-02-21 14:36:48 -0600 (Thu, 21 Feb 2008)
New Revision: 7328

Modified:
   dumbhippo/trunk/client/common/stacker/hippo-canvas-block.c
   dumbhippo/trunk/client/common/stacker/hippo-canvas-block.h
Log:
Improve display of blocks with the time suppressed since they are from the future

Modified: dumbhippo/trunk/client/common/stacker/hippo-canvas-block.c
===================================================================
--- dumbhippo/trunk/client/common/stacker/hippo-canvas-block.c	2008-02-21 18:23:23 UTC (rev 7327)
+++ dumbhippo/trunk/client/common/stacker/hippo-canvas-block.c	2008-02-21 20:36:48 UTC (rev 7328)
@@ -189,12 +189,13 @@
 update_time(HippoCanvasBlock *canvas_block)
 {
     if (canvas_block->age_item) {
-        gboolean nonempty;
-        nonempty = set_timestamp_item(canvas_block, canvas_block->age_parent, canvas_block->age_item, 
-                                      (GTime) (hippo_block_get_timestamp(canvas_block->block) / 1000));
+        canvas_block->age_set = set_timestamp_item(canvas_block, canvas_block->age_parent, canvas_block->age_item, 
+                                                   (GTime) (hippo_block_get_timestamp(canvas_block->block) / 1000));
         
-        hippo_canvas_item_set_visible(canvas_block->age_item,
-                                      nonempty);
+        hippo_canvas_item_set_visible(canvas_block->age_separator_item,
+                                      canvas_block->age_set);
+        hippo_canvas_item_set_visible(canvas_block->age_separator_item,
+                                      canvas_block->expanded && canvas_block->age_set);
     }
 }
 
@@ -206,6 +207,8 @@
             set_timestamp_item(canvas_block,
                                canvas_block->original_age_box, 
                                canvas_block->original_age_item, canvas_block->original_age);
+        hippo_canvas_item_set_visible(HIPPO_CANVAS_ITEM(canvas_block->original_age_box),
+                                      canvas_block->expanded && canvas_block->original_age_set);
     }
 }
 
@@ -924,7 +927,7 @@
                                       canvas_block->expanded && canvas_block->sent_to_set);
     if (canvas_block->age_prefix_item)
         hippo_canvas_item_set_visible(canvas_block->age_prefix_item,
-                                      canvas_block->expanded);
+                                      canvas_block->expanded && canvas_block->age_set);
     if (canvas_block->original_age_box)
         hippo_canvas_item_set_visible(HIPPO_CANVAS_ITEM(canvas_block->original_age_box),
                                       canvas_block->expanded && canvas_block->original_age_set);

Modified: dumbhippo/trunk/client/common/stacker/hippo-canvas-block.h
===================================================================
--- dumbhippo/trunk/client/common/stacker/hippo-canvas-block.h	2008-02-21 18:23:23 UTC (rev 7327)
+++ dumbhippo/trunk/client/common/stacker/hippo-canvas-block.h	2008-02-21 20:36:48 UTC (rev 7328)
@@ -60,6 +60,7 @@
     unsigned int expanded : 1;
     unsigned int hushed : 1;
     unsigned int sent_to_set : 1;
+    unsigned int age_set : 1;
     unsigned int original_age_set : 1;
     unsigned int child_changed_pointer : 1;
 };