Merge lp:~victored/pantheon-files/places-sidebar-granite-expanders into lp:~elementary-apps/pantheon-files/trunk

[Victor Martinez]

Use Granite's Expander renderer and add "source-list" style class.

The purpose of this branch is inheriting the theming and behavior of the expanders from Granite.SourceList without porting files to it.

[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

[lp:~victored/pantheon-files/places-sidebar-granite-expanders]

1155. By Victor Martinez on 2013-04-21

Move variable declarations to the beginning of marlin_places_sidebar_init()

[Cody Garver (codygarver)]

[ 83%] Building C object src/CMakeFiles/pantheon-files.dir/View/Chrome/ImgEventBox.c.o
Linking C executable pantheon-files
CMakeFiles/pantheon-files.dir/marlin-places-sidebar.c.o: In function `marlin_places_sidebar_init':
marlin-places-sidebar.c:(.text+0xb48): undefined reference to `granite_widgets_cell_renderer_expander_set_is_category_expander'
collect2: ld returned 1 exit status
make[2]: *** [src/pantheon-files] Error 1
make[1]: *** [src/CMakeFiles/pantheon-files.dir/all] Error 2
make: *** [all] Error 2

Am I missing a Granite branch?

review: Needs Information

[Victor Martinez (victored)]

Hey Cody, sorry for that.

I forgot to mention that lp:~victored/granite/category-expander is a pre-requisite branch. Please install the granite version from that branch and try again :)

[Cody Garver (codygarver)]

review: Approve

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2012-11-25 01:19:24 +0000
+++ src/CMakeLists.txt	2013-04-21 19:29:27 +0000
@@ -84,7 +84,6 @@
 add_executable(pantheon-files
     eel-editable-label.c
     marlin-application.c
-    gossip-cell-renderer-expander.c
     marlin-enum-types.c
     marlin-bookmark.c
     marlin-bookmark-list.c
 
=== removed 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	1970-01-01 00:00:00 +0000
@@ -1,518 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Copyright (C) 2006  Kristian Rietveld <[e-mail]>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/* To do:
- *  - should probably cancel animation if model changes
- *  - need to handle case where node-in-animation is removed
- *  - it only handles a single animation at a time; but I guess users
- *    aren't fast enough to trigger two or more animations at once anyway :P
- *    (could guard for this by just cancelling the "old" animation, and
- *     start the new one).
- */
-
-#include "config.h"
-
-#include <gtk/gtk.h>
-
-#include "gossip-cell-renderer-expander.h"
-
-#define GET_PRIV(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GOSSIP_TYPE_CELL_RENDERER_EXPANDER, GossipCellRendererExpanderPriv))
-
-static void     gossip_cell_renderer_expander_init         (GossipCellRendererExpander      *expander);
-static void     gossip_cell_renderer_expander_class_init   (GossipCellRendererExpanderClass *klass);
-static void     gossip_cell_renderer_expander_get_property (GObject                         *object,
-                                                            guint                            param_id,
-                                                            GValue                          *value,
-                                                            GParamSpec                      *pspec);
-static void     gossip_cell_renderer_expander_set_property (GObject                         *object,
-                                                            guint                            param_id,
-                                                            const GValue                    *value,
-                                                            GParamSpec                      *pspec);
-static void     gossip_cell_renderer_expander_finalize     (GObject                         *object);
-static void     gossip_cell_renderer_expander_get_size     (GtkCellRenderer                 *cell,
-                                                            GtkWidget                       *widget,
-                                                            const GdkRectangle              *cell_area,
-                                                            gint                            *x_offset,
-                                                            gint                            *y_offset,
-                                                            gint                            *width,
-                                                            gint                            *height);
-static void     gossip_cell_renderer_expander_render       (GtkCellRenderer                 *cell,
-                                                            cairo_t                         *cr,
-                                                            GtkWidget                       *widget,
-                                                            const GdkRectangle              *background_area,
-                                                            const GdkRectangle              *cell_area,
-                                                            GtkCellRendererState             flags);
-static gboolean gossip_cell_renderer_expander_activate     (GtkCellRenderer                 *cell,
-                                                            GdkEvent                        *event,
-                                                            GtkWidget                       *widget,
-                                                            const gchar                     *path,
-                                                            const GdkRectangle              *background_area,
-                                                            const GdkRectangle              *cell_area,
-                                                            GtkCellRendererState             flags);
-
-/* Properties */
-enum {
-    PROP_0,
-    PROP_EXPANDER_STYLE,
-    PROP_EXPANDER_SIZE,
-    PROP_ACTIVATABLE
-};
-
-typedef struct _GossipCellRendererExpanderPriv GossipCellRendererExpanderPriv;
-
-struct _GossipCellRendererExpanderPriv {
-    GtkExpanderStyle     expander_style;
-    gint                 expander_size;
-
-    GtkTreeView         *animation_view;
-    GtkTreeRowReference *animation_node;
-    GtkExpanderStyle     animation_style;
-    guint                animation_timeout;
-    GdkRectangle         animation_area;
-
-    guint                activatable : 1;
-    guint                animation_expanding : 1;
-};
-
-G_DEFINE_TYPE (GossipCellRendererExpander, gossip_cell_renderer_expander, GTK_TYPE_CELL_RENDERER)
-
-static void
-gossip_cell_renderer_expander_init (GossipCellRendererExpander *expander)
-{
-    GossipCellRendererExpanderPriv *priv;
-
-    priv = GET_PRIV (expander);
-
-    priv->expander_style = GTK_EXPANDER_COLLAPSED;
-    priv->expander_size = 12;
-    priv->activatable = TRUE;
-    priv->animation_node = NULL;
-
-    gtk_cell_renderer_set_padding (GTK_CELL_RENDERER (expander), 2, 2);
-    g_object_set (expander,
-                  "mode", GTK_CELL_RENDERER_MODE_ACTIVATABLE,
-                  NULL);
-}
-
-static void
-gossip_cell_renderer_expander_class_init (GossipCellRendererExpanderClass *klass)
-{
-    GObjectClass         *object_class;
-    GtkCellRendererClass *cell_class;
-
-    object_class  = G_OBJECT_CLASS (klass);
-    cell_class = GTK_CELL_RENDERER_CLASS (klass);
-
-    object_class->finalize = gossip_cell_renderer_expander_finalize;
-
-    object_class->get_property = gossip_cell_renderer_expander_get_property;
-    object_class->set_property = gossip_cell_renderer_expander_set_property;
-
-    cell_class->get_size = gossip_cell_renderer_expander_get_size;
-    cell_class->render = gossip_cell_renderer_expander_render;
-    cell_class->activate = gossip_cell_renderer_expander_activate;
-
-    g_object_class_install_property (object_class,
-                                     PROP_EXPANDER_STYLE,
-                                     g_param_spec_enum ("expander-style",
-                                                        "Expander Style",
-                                                        "Style to use when painting the expander",
-                                                        GTK_TYPE_EXPANDER_STYLE,
-                                                        GTK_EXPANDER_COLLAPSED,
-                                                        G_PARAM_READWRITE));
-
-    g_object_class_install_property (object_class,
-                                     PROP_EXPANDER_SIZE,
-                                     g_param_spec_int ("expander-size",
-                                                       "Expander Size",
-                                                       "The size of the expander",
-                                                       0,
-                                                       G_MAXINT,
-                                                       12,
-                                                       G_PARAM_READWRITE));
-
-    g_object_class_install_property (object_class,
-                                     PROP_ACTIVATABLE,
-                                     g_param_spec_boolean ("activatable",
-                                                           "Activatable",
-                                                           "The expander can be activated",
-                                                           TRUE,
-                                                           G_PARAM_READWRITE));
-
-    g_type_class_add_private (object_class, sizeof (GossipCellRendererExpanderPriv));
-}
-
-static void
-gossip_cell_renderer_expander_get_property (GObject    *object,
-                                            guint       param_id,
-                                            GValue     *value,
-                                            GParamSpec *pspec)
-{
-    GossipCellRendererExpander     *expander;
-    GossipCellRendererExpanderPriv *priv;
-
-    expander = GOSSIP_CELL_RENDERER_EXPANDER (object);
-    priv = GET_PRIV (expander);
-
-    switch (param_id) {
-    case PROP_EXPANDER_STYLE:
-        g_value_set_enum (value, priv->expander_style);
-        break;
-
-    case PROP_EXPANDER_SIZE:
-        g_value_set_int (value, priv->expander_size);
-        break;
-
-    case PROP_ACTIVATABLE:
-        g_value_set_boolean (value, priv->activatable);
-        break;
-
-    default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
-        break;
-    }
-}
-
-static void
-gossip_cell_renderer_expander_set_property (GObject      *object,
-                                            guint         param_id,
-                                            const GValue *value,
-                                            GParamSpec   *pspec)
-{
-    GossipCellRendererExpander     *expander;
-    GossipCellRendererExpanderPriv *priv;
-
-    expander = GOSSIP_CELL_RENDERER_EXPANDER (object);
-    priv = GET_PRIV (expander);
-
-    switch (param_id) {
-    case PROP_EXPANDER_STYLE:
-        priv->expander_style = g_value_get_enum (value);
-        break;
-
-    case PROP_EXPANDER_SIZE:
-        priv->expander_size = g_value_get_int (value);
-        break;
-
-    case PROP_ACTIVATABLE:
-        priv->activatable = g_value_get_boolean (value);
-        break;
-
-    default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
-        break;
-    }
-}
-
-static void
-gossip_cell_renderer_expander_finalize (GObject *object)
-{
-    GossipCellRendererExpanderPriv *priv;
-
-    priv = GET_PRIV (object);
-
-    if (priv->animation_timeout) {
-        g_source_remove (priv->animation_timeout);
-        priv->animation_timeout = 0;
-    }
-
-    if (priv->animation_node) {
-        gtk_tree_row_reference_free (priv->animation_node);
-    }
-
-    (* G_OBJECT_CLASS (gossip_cell_renderer_expander_parent_class)->finalize) (object);
-}
-
-GtkCellRenderer *
-gossip_cell_renderer_expander_new (void)
-{
-    return g_object_new (GOSSIP_TYPE_CELL_RENDERER_EXPANDER, NULL);
-}
-
-static void
-gossip_cell_renderer_expander_get_size (GtkCellRenderer     *cell,
-                                        GtkWidget           *widget,
-                                        const GdkRectangle  *cell_area,
-                                        gint                *x_offset,
-                                        gint                *y_offset,
-                                        gint                *width,
-                                        gint                *height)
-{
-    GossipCellRendererExpander     *expander;
-    GossipCellRendererExpanderPriv *priv;
-    gint                            xpad, ypad;
-    gfloat                          xalign, yalign;
-
-    expander = (GossipCellRendererExpander*) cell;
-    priv = GET_PRIV (expander);
-    gtk_cell_renderer_get_padding (cell, &xpad, &ypad);
-
-    if (cell_area) {
-
-        gtk_cell_renderer_get_alignment (cell, &xalign, &yalign);
-
-        if (x_offset) {
-            *x_offset = xalign * (cell_area->width - (priv->expander_size + (2 * xpad)));
-            *x_offset = MAX (*x_offset, 0);
-        }
-
-        if (y_offset) {
-            *y_offset = yalign * (cell_area->height - (priv->expander_size + (2 * ypad)));
-            *y_offset = MAX (*y_offset, 0);
-        }
-    } else {
-        if (x_offset)
-            *x_offset = 0;
-
-        if (y_offset)
-            *y_offset = 0;
-    }
-
-    if (width)
-        *width = xpad * 2 + priv->expander_size;
-
-    if (height)
-        *height = ypad * 2 + priv->expander_size;
-}
-
-static void
-gossip_cell_renderer_expander_render (GtkCellRenderer      *cell,
-                                      cairo_t              *cr,
-                                      GtkWidget            *widget,
-                                      const GdkRectangle   *background_area,
-                                      const GdkRectangle   *cell_area,
-                                      GtkCellRendererState  flags)
-{
-    GossipCellRendererExpander     *expander;
-    GossipCellRendererExpanderPriv *priv;
-    GtkExpanderStyle                expander_style;
-    gint                            x_offset, y_offset;
-    gint                            xpad, ypad;
-
-    expander = (GossipCellRendererExpander*) cell;
-    priv = GET_PRIV (expander);
-
-    if (priv->animation_node) {
-        GtkTreePath *path;
-        GdkRectangle rect;
-
-        /* Not sure if I like this ... */
-        path = gtk_tree_row_reference_get_path (priv->animation_node);
-        gtk_tree_view_get_background_area (priv->animation_view, path,
-                                           NULL, &rect);
-        gtk_tree_path_free (path);
-
-        if (background_area->y == rect.y)
-            expander_style = priv->animation_style;
-        else
-            expander_style = priv->expander_style;
-    } else
-        expander_style = priv->expander_style;
-
-    gossip_cell_renderer_expander_get_size (cell, widget, cell_area,
-                                            &x_offset, &y_offset,
-                                            NULL, NULL);
-    gtk_cell_renderer_get_padding (cell, &xpad, &ypad);
-
-    gtk_paint_expander (gtk_widget_get_style (widget),
-                        cr,
-                        GTK_STATE_NORMAL,
-                        widget,
-                        "treeview",
-                        cell_area->x + x_offset + xpad + priv->expander_size / 2,
-                        cell_area->y + y_offset + ypad + priv->expander_size / 2,
-                        expander_style);
-}
-
-static void
-invalidate_node (GtkTreeView *tree_view,
-                 GtkTreePath *path)
-{
-    GtkAllocation  allocation;
-    GdkWindow     *bin_window;
-    GdkRectangle   rect;
-
-    bin_window = gtk_tree_view_get_bin_window (tree_view);
-
-    gtk_tree_view_get_background_area (tree_view, path, NULL, &rect);
-    gtk_widget_get_allocation (GTK_WIDGET (tree_view), &allocation);
-
-    rect.x = 0;
-    rect.width = allocation.width;
-
-    gdk_window_invalidate_rect (bin_window, &rect, TRUE);
-}
-
-static gboolean
-do_animation (GossipCellRendererExpander *expander)
-{
-    GossipCellRendererExpanderPriv *priv;
-    GtkTreePath                    *path;
-    gboolean                        done = FALSE;
-
-    priv = GET_PRIV (expander);
-
-    if (priv->animation_expanding) {
-        if (priv->animation_style == GTK_EXPANDER_SEMI_COLLAPSED)
-            priv->animation_style = GTK_EXPANDER_SEMI_EXPANDED;
-        else if (priv->animation_style == GTK_EXPANDER_SEMI_EXPANDED) {
-            priv->animation_style = GTK_EXPANDER_EXPANDED;
-            done = TRUE;
-        }
-    } else {
-        if (priv->animation_style == GTK_EXPANDER_SEMI_EXPANDED)
-            priv->animation_style = GTK_EXPANDER_SEMI_COLLAPSED;
-        else if (priv->animation_style == GTK_EXPANDER_SEMI_COLLAPSED) {
-            priv->animation_style = GTK_EXPANDER_COLLAPSED;
-            done = TRUE;
-        }
-    }
-
-    if (priv->animation_node) {
-        path = gtk_tree_row_reference_get_path (priv->animation_node);
-        invalidate_node (priv->animation_view, path);
-        gtk_tree_path_free (path);
-    }
-
-    if (done) {
-        gtk_tree_row_reference_free (priv->animation_node);
-        priv->animation_node = NULL;
-        priv->animation_timeout = 0;
-    }
-
-    return !done;
-}
-
-static gboolean
-animation_timeout (gpointer data)
-{
-    gboolean retval;
-
-    GDK_THREADS_ENTER ();
-
-    retval = do_animation (data);
-
-    GDK_THREADS_LEAVE ();
-
-    return retval;
-}
-
-static void
-gossip_cell_renderer_expander_start_animation (GossipCellRendererExpander *expander,
-                                               GtkTreeView                *tree_view,
-                                               GtkTreePath                *path,
-                                               gboolean                    expanding,
-                                               const GdkRectangle         *background_area)
-{
-    GossipCellRendererExpanderPriv *priv;
-
-    priv = GET_PRIV (expander);
-
-    if (expanding) {
-        priv->animation_style = GTK_EXPANDER_SEMI_COLLAPSED;
-    } else {
-        priv->animation_style = GTK_EXPANDER_SEMI_EXPANDED;
-    }
-
-    invalidate_node (tree_view, path);
-
-    priv->animation_expanding = expanding;
-    priv->animation_view = tree_view;
-    priv->animation_node = gtk_tree_row_reference_new (gtk_tree_view_get_model (tree_view), path);
-    priv->animation_timeout = g_timeout_add (50, animation_timeout, expander);
-}
-
-static gboolean
-gossip_cell_renderer_expander_activate (GtkCellRenderer      *cell,
-                                        GdkEvent             *event,
-                                        GtkWidget            *widget,
-                                        const gchar          *path_string,
-                                        const GdkRectangle   *background_area,
-                                        const GdkRectangle   *cell_area,
-                                        GtkCellRendererState flags)
-{
-    GossipCellRendererExpander     *expander;
-    GossipCellRendererExpanderPriv *priv;
-    GtkTreePath                    *path;
-    GtkSettings                    *settings;
-    gboolean                        animate = FALSE;
-    gboolean                        expanding;
-    gboolean                        in_cell;
-    int                             mouse_x;
-    int                             mouse_y;
-
-    expander = GOSSIP_CELL_RENDERER_EXPANDER (cell);
-    priv = GET_PRIV (cell);
-
-    if (!GTK_IS_TREE_VIEW (widget) || !priv->activatable)
-        return FALSE;
-
-    path = gtk_tree_path_new_from_string (path_string);
-
-    gtk_widget_get_pointer (widget, &mouse_x, &mouse_y);
-    gtk_tree_view_convert_widget_to_bin_window_coords (GTK_TREE_VIEW (widget),
-                                                       mouse_x, mouse_y,
-                                                       &mouse_x, &mouse_y);
-
-    /* check if click is within the cell */
-    if (mouse_x - cell_area->x >= 0
-        && mouse_x - cell_area->x <= cell_area->width) {
-        in_cell = TRUE;
-    } else {
-        in_cell = FALSE;
-    }
-
-    if (! in_cell) {
-        return FALSE;
-    }
-
-#if 0
-    if (gtk_tree_path_get_depth (path) > 1) {
-        gtk_tree_path_free (path);
-        return TRUE;
-    }
-#endif
-    settings = gtk_widget_get_settings (GTK_WIDGET (widget));
-    if (g_object_class_find_property (G_OBJECT_GET_CLASS (settings), "gtk-enable-animations")) {
-        g_object_get (settings,
-                      "gtk-enable-animations", &animate,
-                      NULL);
-    }
-
-    if (gtk_tree_view_row_expanded (GTK_TREE_VIEW (widget), path)) {
-        gtk_tree_view_collapse_row (GTK_TREE_VIEW (widget), path);
-        expanding = FALSE;
-    } else {
-        gtk_tree_view_expand_row (GTK_TREE_VIEW (widget), path, FALSE);
-        expanding = TRUE;
-    }
-
-    if (animate) {
-        gossip_cell_renderer_expander_start_animation (expander,
-                                                       GTK_TREE_VIEW (widget),
-                                                       path,
-                                                       expanding,
-                                                       background_area);
-    }
-
-    gtk_tree_path_free (path);
-
-    return TRUE;
-}
 
=== removed file 'src/gossip-cell-renderer-expander.h'
--- src/gossip-cell-renderer-expander.h	2010-12-02 11:36:38 +0000
+++ src/gossip-cell-renderer-expander.h	1970-01-01 00:00:00 +0000
@@ -1,57 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Copyright (C) 2006  Kristian Rietveld <[e-mail]>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GOSSIP_CELL_RENDERER_EXPANDER_H__
-#define __GOSSIP_CELL_RENDERER_EXPANDER_H__
-
-#include <gtk/gtk.h>
-
-G_BEGIN_DECLS
-
-#define GOSSIP_TYPE_CELL_RENDERER_EXPANDER		(gossip_cell_renderer_expander_get_type ())
-#define GOSSIP_CELL_RENDERER_EXPANDER(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), GOSSIP_TYPE_CELL_RENDERER_EXPANDER, GossipCellRendererExpander))
-#define GOSSIP_CELL_RENDERER_EXPANDER_CLASS(klass)	(G_TYPE_CHECK_CLASS_CAST ((klass), GOSSIP_TYPE_CELL_RENDERER_EXPANDER, GossipCellRendererExpanderClass))
-#define GOSSIP_IS_CELL_RENDERER_EXPANDER(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), GOSSIP_TYPE_CELL_RENDERER_EXPANDER))
-#define GOSSIP_IS_CELL_RENDERER_EXPANDER_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), GOSSIP_TYPE_CELL_RENDERER_EXPANDER))
-#define GOSSIP_CELL_RENDERER_EXPANDER_GET_CLASS(obj)	(G_TYPE_INSTANCE_GET_CLASS ((obj), GOSSIP_TYPE_CELL_RENDERER_EXPANDER, GossipCellRendererExpanderClass))
-
-typedef struct _GossipCellRendererExpander GossipCellRendererExpander;
-typedef struct _GossipCellRendererExpanderClass GossipCellRendererExpanderClass;
-
-struct _GossipCellRendererExpander {
-  GtkCellRenderer parent;
-};
-
-struct _GossipCellRendererExpanderClass {
-  GtkCellRendererClass parent_class;
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-GType            gossip_cell_renderer_expander_get_type (void) G_GNUC_CONST;
-GtkCellRenderer *gossip_cell_renderer_expander_new      (void);
-
-G_END_DECLS
-
-#endif /* __GOSSIP_CELL_RENDERER_EXPANDER_H__ */
 
=== 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-21 19:29:27 +0000
@@ -26,7 +26,6 @@
 #include "eel-fcts.h"
 #include "eel-gtk-extensions.h"
 #include "eel-gio-extensions.h"
-#include "gossip-cell-renderer-expander.h"
 #include <gdk/gdkkeysyms.h>
 #include <glib/gi18n.h>
 #include <gio/gio.h>
@@ -2749,10 +2748,7 @@
         row_expanded = gtk_tree_view_row_expanded (GTK_TREE_VIEW (gtk_tree_view_column_get_tree_view (tree_column)), path);
         gtk_tree_path_free (path);
 
-        g_object_set (sidebar->expander_renderer,
-                      "visible", TRUE,
-                      "expander-style", row_expanded ? GTK_EXPANDER_EXPANDED : GTK_EXPANDER_COLLAPSED,
-                      NULL);
+        g_object_set (sidebar->expander_renderer, "visible", TRUE, NULL);
     } else {
         g_object_set (sidebar->expander_renderer, "visible", FALSE, NULL);
     }
@@ -2819,6 +2815,8 @@
     GtkTreeViewColumn *expcol;
     GtkCellRenderer   *cell;
     GtkTreeSelection  *selection;
+    GtkStyleContext   *style_context;
+    GraniteWidgetsCellRendererExpander *expander_renderer;
 
     sidebar->uri = NULL;
     sidebar->volume_monitor = g_volume_monitor_get ();
@@ -2919,12 +2917,18 @@
     g_object_set (tree_view, "show-expanders", FALSE, NULL);
 
     /* Expander */
+    expander_renderer = granite_widgets_cell_renderer_expander_new ();
 
-    cell = gossip_cell_renderer_expander_new ();
-    sidebar->expander_renderer = cell;
     /* align expander with eject buttons */
     gint exp_size;
-    g_object_get (cell, "expander-size", &exp_size, NULL);
+    exp_size = GRANITE_WIDGETS_CELL_RENDERER_EXPANDER_GET_CLASS (expander_renderer)->get_arrow_size (expander_renderer,
+                                                                                                     GTK_WIDGET (tree_view));
+
+    granite_widgets_cell_renderer_expander_set_is_category_expander (expander_renderer, TRUE);
+
+    cell = GTK_CELL_RENDERER (expander_renderer);
+    sidebar->expander_renderer = cell;
+
     g_object_set (cell, "xpad", ABS (16 - exp_size) + EJECT_BUTTON_XPAD - 2, "xalign", 1.0, NULL);
     gtk_tree_view_column_pack_end (col, cell, FALSE);
     gtk_tree_view_column_set_cell_data_func (col, 
@@ -2945,7 +2949,9 @@
 
     gtk_container_add (GTK_CONTAINER (sidebar), GTK_WIDGET (tree_view));
 
-    gtk_style_context_add_class(gtk_widget_get_style_context(GTK_WIDGET(tree_view)), "sidebar");
+    style_context = gtk_widget_get_style_context (GTK_WIDGET (tree_view));
+    gtk_style_context_add_class (style_context, GTK_STYLE_CLASS_SIDEBAR);
+    gtk_style_context_add_class (style_context, GRANITE_STYLE_CLASS_SOURCE_LIST);
 
     gtk_widget_show (GTK_WIDGET (tree_view));
     gtk_widget_show (GTK_WIDGET (sidebar));