callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor cleanups

Browse Source
This commit is contained in:
Matthias Clasen
2011-07-25 00:34:08 -04:00
parent a4560cdfbb
commit 2c6c0fe329
1 changed files with 19 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
gtk/gtkiconview.c
View File

@ -7236,9 +7236,9 @@ typedef struct {
static gboolean static gboolean
get_pixbuf_foreach (GtkCellRenderer *renderer, get_pixbuf_foreach (GtkCellRenderer *renderer,
const GdkRectangle *cell_area, const GdkRectangle *cell_area,
const GdkRectangle *cell_background, const GdkRectangle *cell_background,
GetPixbufBoxData *data) GetPixbufBoxData *data)
{ {
if (GTK_IS_CELL_RENDERER_PIXBUF (renderer)) if (GTK_IS_CELL_RENDERER_PIXBUF (renderer))
{ {
@ -7250,8 +7250,8 @@ get_pixbuf_foreach (GtkCellRenderer *renderer,
static gboolean static gboolean
get_pixbuf_box (GtkIconView *icon_view, get_pixbuf_box (GtkIconView *icon_view,
GtkIconViewItem *item, GtkIconViewItem *item,
GdkRectangle *box) GdkRectangle *box)
{ {
GetPixbufBoxData data = { { 0, }, FALSE }; GetPixbufBoxData data = { { 0, }, FALSE };
GtkCellAreaContext *context; GtkCellAreaContext *context;
@ -7260,9 +7260,9 @@ get_pixbuf_box (GtkIconView *icon_view,
gtk_icon_view_set_cell_data (icon_view, item); gtk_icon_view_set_cell_data (icon_view, item);
gtk_cell_area_foreach_alloc (icon_view->priv->cell_area, context, gtk_cell_area_foreach_alloc (icon_view->priv->cell_area, context,
GTK_WIDGET (icon_view), GTK_WIDGET (icon_view),
(GdkRectangle *)item, (GdkRectangle *)item, (GdkRectangle *)item, (GdkRectangle *)item,
(GtkCellAllocCallback)get_pixbuf_foreach, &data); (GtkCellAllocCallback)get_pixbuf_foreach, &data);
return data.pixbuf_found; return data.pixbuf_found;
} }
@ -7663,12 +7663,11 @@ gtk_icon_view_item_accessible_add_state (GtkIconViewItemAccessible *item,
gboolean rc; gboolean rc;
rc = atk_state_set_add_state (item->state_set, state_type); rc = atk_state_set_add_state (item->state_set, state_type);
/*
* The signal should only be generated if the value changed, /* The signal should only be generated if the value changed,
* not when the item is set up. So states that are set * not when the item is set up. So states that are set
* initially should pass FALSE as the emit_signal argument. * initially should pass FALSE as the emit_signal argument.
*/ */
if (emit_signal) if (emit_signal)
{ {
atk_object_notify_state_change (ATK_OBJECT (item), state_type, TRUE); atk_object_notify_state_change (ATK_OBJECT (item), state_type, TRUE);
@ -7690,12 +7689,11 @@ gtk_icon_view_item_accessible_remove_state (GtkIconViewItemAccessible *item,
gboolean rc; gboolean rc;
rc = atk_state_set_remove_state (item->state_set, state_type); rc = atk_state_set_remove_state (item->state_set, state_type);
/*
* The signal should only be generated if the value changed, /* The signal should only be generated if the value changed,
* not when the item is set up. So states that are set * not when the item is set up. So states that are set
* initially should pass FALSE as the emit_signal argument. * initially should pass FALSE as the emit_signal argument.
*/ */
if (emit_signal) if (emit_signal)
{ {
atk_object_notify_state_change (ATK_OBJECT (item), state_type, FALSE); atk_object_notify_state_change (ATK_OBJECT (item), state_type, FALSE);
@ -7718,11 +7716,9 @@ gtk_icon_view_item_accessible_is_showing (GtkIconViewItemAccessible *item)
GdkRectangle visible_rect; GdkRectangle visible_rect;
gboolean is_showing; gboolean is_showing;
/* /* An item is considered "SHOWING" if any part of the item
* An item is considered "SHOWING" if any part of the item is in the * is in the visible rectangle.
* visible rectangle.
*/ */
if (!GTK_IS_ICON_VIEW (item->widget)) if (!GTK_IS_ICON_VIEW (item->widget))
return FALSE; return FALSE;
@ -7745,7 +7741,7 @@ gtk_icon_view_item_accessible_is_showing (GtkIconViewItemAccessible *item)
((item->item->cell_area.y + item->item->cell_area.height) < (visible_rect.y)) || ((item->item->cell_area.y + item->item->cell_area.height) < (visible_rect.y)) ||
(item->item->cell_area.x > (visible_rect.x + visible_rect.width)) || (item->item->cell_area.x > (visible_rect.x + visible_rect.width)) ||
(item->item->cell_area.y > (visible_rect.y + visible_rect.height))) (item->item->cell_area.y > (visible_rect.y + visible_rect.height)))
is_showing = FALSE; is_showing = FALSE;
else else
is_showing = TRUE; is_showing = TRUE;
@ -7758,10 +7754,10 @@ gtk_icon_view_item_accessible_set_visibility (GtkIconViewItemAccessible *item,
{ {
if (gtk_icon_view_item_accessible_is_showing (item)) if (gtk_icon_view_item_accessible_is_showing (item))
return gtk_icon_view_item_accessible_add_state (item, ATK_STATE_SHOWING, return gtk_icon_view_item_accessible_add_state (item, ATK_STATE_SHOWING,
emit_signal); emit_signal);
else else
return gtk_icon_view_item_accessible_remove_state (item, ATK_STATE_SHOWING, return gtk_icon_view_item_accessible_remove_state (item, ATK_STATE_SHOWING,
emit_signal); emit_signal);
} }
static void static void