Merge lp:~victored/pantheon-files/hidden-source-list-expanders into lp:~elementary-apps/pantheon-files/trunk

[Victor Martinez]

Only show source list expanders on hover.

[lp:~victored/pantheon-files/hidden-source-list-expanders]

1155. By Victor Martinez on 2013-04-20

remove dummy function prototype

1156. By Victor Martinez on 2013-04-20

coding style fix

[Cody Garver (codygarver)]

I thought Dan was going to accomplish this using the theme.

review: Needs Information

[Victor Martinez (victored)]

Now that I think more about it, that sounds like a better idea. Specially if Daniel ever wants animations.

I'll modify Granite's expander renderer to use an special style class for the expanders in main categories, and use Granite's renderer from Files, dropping gossip-cell-renderer-expander.* along the way.

Let's leave this as a proof-of-concept.

review: Disapprove

Unmerged revisions

1156. By Victor Martinez on 2013-04-20

coding style fix

1155. By Victor Martinez on 2013-04-20

remove dummy function prototype

1154. By Victor Martinez on 2013-04-20

Only draw source-list expanders when hovering over them.

=== modified file 'src/gossip-cell-renderer-expander.c'
--- src/gossip-cell-renderer-expander.c	2011-01-12 14:15:32 +0000
+++ src/gossip-cell-renderer-expander.c	2013-04-20 10:09:26 +0000
@@ -72,7 +72,8 @@
     PROP_0,
     PROP_EXPANDER_STYLE,
     PROP_EXPANDER_SIZE,
-    PROP_ACTIVATABLE
+    PROP_ACTIVATABLE,
+    PROP_ONLY_DRAW_ON_HOVER
 };
 
 typedef struct _GossipCellRendererExpanderPriv GossipCellRendererExpanderPriv;
@@ -89,6 +90,7 @@
 
     guint                activatable : 1;
     guint                animation_expanding : 1;
+    guint                only_draw_on_hover : 1;
 };
 
 G_DEFINE_TYPE (GossipCellRendererExpander, gossip_cell_renderer_expander, GTK_TYPE_CELL_RENDERER)
@@ -104,6 +106,7 @@
     priv->expander_size = 12;
     priv->activatable = TRUE;
     priv->animation_node = NULL;
+    priv->only_draw_on_hover = FALSE;
 
     gtk_cell_renderer_set_padding (GTK_CELL_RENDERER (expander), 2, 2);
     g_object_set (expander,
@@ -156,6 +159,14 @@
                                                            TRUE,
                                                            G_PARAM_READWRITE));
 
+    g_object_class_install_property (object_class,
+                                     PROP_ONLY_DRAW_ON_HOVER,
+                                     g_param_spec_boolean ("only-draw-on-hover",
+                                                           "Only Draw On Hover",
+                                                           "Whether to only draw expander when the renderer is hovered",
+                                                           FALSE,
+                                                           G_PARAM_READWRITE));
+
     g_type_class_add_private (object_class, sizeof (GossipCellRendererExpanderPriv));
 }
 
@@ -184,6 +195,10 @@
         g_value_set_boolean (value, priv->activatable);
         break;
 
+    case PROP_ONLY_DRAW_ON_HOVER:
+        g_value_set_boolean (value, priv->only_draw_on_hover);
+        break;
+
     default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
         break;
@@ -215,6 +230,10 @@
         priv->activatable = g_value_get_boolean (value);
         break;
 
+    case PROP_ONLY_DRAW_ON_HOVER:
+        priv->only_draw_on_hover = g_value_get_boolean (value);
+        break;
+
     default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
         break;
@@ -305,10 +324,16 @@
     GtkExpanderStyle                expander_style;
     gint                            x_offset, y_offset;
     gint                            xpad, ypad;
+    gboolean                        hovered;
 
     expander = (GossipCellRendererExpander*) cell;
     priv = GET_PRIV (expander);
 
+    hovered = (flags & GTK_CELL_RENDERER_PRELIT) != 0;
+
+    if (priv->only_draw_on_hover && !hovered)
+        return;
+
     if (priv->animation_node) {
         GtkTreePath *path;
         GdkRectangle rect;

=== modified file 'src/marlin-places-sidebar.c'
--- src/marlin-places-sidebar.c	2013-02-05 23:40:22 +0000
+++ src/marlin-places-sidebar.c	2013-04-20 10:09:26 +0000
@@ -2921,7 +2921,9 @@
     /* Expander */
 
     cell = gossip_cell_renderer_expander_new ();
+    g_object_set (cell, "only-draw-on-hover", TRUE, NULL);
     sidebar->expander_renderer = cell;
+
     /* align expander with eject buttons */
     gint exp_size;
     g_object_get (cell, "expander-size", &exp_size, NULL);