development/gitg
development/gitg
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/gitg synced 2024-10-31 04:58:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

More coding style fixes

Browse source
This commit is contained in:
Alexander Larsson 2012-08-16 16:58:24 +02:00
parent 27076ebe62
commit 2199bbb508
1 changed files with 51 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

103
egg-list-box.c
View file

@ -239,11 +239,12 @@ egg_list_box_init (EggListBox *list_box)
{ {
EggListBoxPrivate *priv; EggListBoxPrivate *priv;
priv = list_box->priv = G_TYPE_INSTANCE_GET_PRIVATE (list_box, EGG_TYPE_LIST_BOX, EggListBoxPrivate); list_box->priv = priv =
G_TYPE_INSTANCE_GET_PRIVATE (list_box, EGG_TYPE_LIST_BOX, EggListBoxPrivate);
gtk_widget_set_can_focus ((GtkWidget*) list_box, TRUE); gtk_widget_set_can_focus (GTK_WIDGET (list_box), TRUE);
gtk_widget_set_has_window ((GtkWidget*) list_box, TRUE); gtk_widget_set_has_window (GTK_WIDGET (list_box), TRUE);
gtk_widget_set_redraw_on_allocate ((GtkWidget*) list_box, TRUE); gtk_widget_set_redraw_on_allocate (GTK_WIDGET (list_box), TRUE);
priv->selection_mode = GTK_SELECTION_SINGLE; priv->selection_mode = GTK_SELECTION_SINGLE;
priv->activate_single_click = TRUE; priv->activate_single_click = TRUE;
@ -255,7 +256,6 @@ egg_list_box_init (EggListBox *list_box)
static void static void
egg_list_box_finalize (GObject *obj) egg_list_box_finalize (GObject *obj)
{ {
EggListBox *list_box = EGG_LIST_BOX (obj); EggListBox *list_box = EGG_LIST_BOX (obj);
EggListBoxPrivate *priv = list_box->priv; EggListBoxPrivate *priv = list_box->priv;
@ -530,7 +530,7 @@ egg_list_box_refilter (EggListBox *list_box)
egg_list_box_apply_filter_all (list_box); egg_list_box_apply_filter_all (list_box);
egg_list_box_reseparate (list_box); egg_list_box_reseparate (list_box);
gtk_widget_queue_resize ((GtkWidget*) list_box); gtk_widget_queue_resize (GTK_WIDGET (list_box));
} }
static gint static gint
@ -554,7 +554,7 @@ egg_list_box_resort (EggListBox *list_box)
g_sequence_sort (priv->children, g_sequence_sort (priv->children,
(GCompareDataFunc)do_sort, list_box); (GCompareDataFunc)do_sort, list_box);
egg_list_box_reseparate (list_box); egg_list_box_reseparate (list_box);
gtk_widget_queue_resize ((GtkWidget*) list_box); gtk_widget_queue_resize (GTK_WIDGET (list_box));
} }
void void
@ -570,7 +570,7 @@ egg_list_box_reseparate (EggListBox *list_box)
iter = g_sequence_iter_next (iter)) iter = g_sequence_iter_next (iter))
egg_list_box_update_separator (list_box, iter); egg_list_box_update_separator (list_box, iter);
gtk_widget_queue_resize ((GtkWidget*) list_box); gtk_widget_queue_resize (GTK_WIDGET (list_box));
} }
void void
@ -612,10 +612,10 @@ egg_list_box_child_changed (EggListBox *list_box, GtkWidget *widget)
g_sequence_sort_changed (info->iter, g_sequence_sort_changed (info->iter,
(GCompareDataFunc)do_sort, (GCompareDataFunc)do_sort,
list_box); list_box);
gtk_widget_queue_resize ((GtkWidget*) list_box); gtk_widget_queue_resize (GTK_WIDGET (list_box));
} }
egg_list_box_apply_filter (list_box, info->widget); egg_list_box_apply_filter (list_box, info->widget);
if (gtk_widget_get_visible ((GtkWidget*) list_box)) if (gtk_widget_get_visible (GTK_WIDGET (list_box)))
{ {
next = egg_list_box_get_next_visible (list_box, info->iter); next = egg_list_box_get_next_visible (list_box, info->iter);
egg_list_box_update_separator (list_box, info->iter); egg_list_box_update_separator (list_box, info->iter);
@ -683,12 +683,12 @@ egg_list_box_update_cursor (EggListBox *list_box,
EggListBoxPrivate *priv = list_box->priv; EggListBoxPrivate *priv = list_box->priv;
priv->cursor_child = child; priv->cursor_child = child;
gtk_widget_grab_focus ((GtkWidget*) list_box); gtk_widget_grab_focus (GTK_WIDGET (list_box));
gtk_widget_queue_draw ((GtkWidget*) list_box); gtk_widget_queue_draw (GTK_WIDGET (list_box));
if (child != NULL && priv->adjustment != NULL) if (child != NULL && priv->adjustment != NULL)
{ {
GtkAllocation allocation; GtkAllocation allocation;
gtk_widget_get_allocation ((GtkWidget*) list_box, &allocation); gtk_widget_get_allocation (GTK_WIDGET (list_box), &allocation);
gtk_adjustment_clamp_page (priv->adjustment, gtk_adjustment_clamp_page (priv->adjustment,
priv->cursor_child->y + allocation.y, priv->cursor_child->y + allocation.y,
priv->cursor_child->y + allocation.y + priv->cursor_child->height); priv->cursor_child->y + allocation.y + priv->cursor_child->height);
@ -707,7 +707,7 @@ egg_list_box_update_selected (EggListBox *list_box,
priv->selected_child = child; priv->selected_child = child;
g_signal_emit (list_box, signals[CHILD_SELECTED], 0, g_signal_emit (list_box, signals[CHILD_SELECTED], 0,
(priv->selected_child != NULL) ? priv->selected_child->widget : NULL); (priv->selected_child != NULL) ? priv->selected_child->widget : NULL);
gtk_widget_queue_draw ((GtkWidget*) list_box); gtk_widget_queue_draw (GTK_WIDGET (list_box));
} }
if (child != NULL) if (child != NULL)
egg_list_box_update_cursor (list_box, child); egg_list_box_update_cursor (list_box, child);
@ -735,7 +735,7 @@ egg_list_box_update_prelight (EggListBox *list_box, EggListBoxChildInfo *child)
if (child != priv->prelight_child) if (child != priv->prelight_child)
{ {
priv->prelight_child = child; priv->prelight_child = child;
gtk_widget_queue_draw ((GtkWidget*) list_box); gtk_widget_queue_draw (GTK_WIDGET (list_box));
} }
} }
@ -750,7 +750,7 @@ egg_list_box_update_active (EggListBox *list_box, EggListBoxChildInfo *child)
val != priv->active_child_active) val != priv->active_child_active)
{ {
priv->active_child_active = val; priv->active_child_active = val;
gtk_widget_queue_draw ((GtkWidget*) list_box); gtk_widget_queue_draw (GTK_WIDGET (list_box));
} }
} }
@ -762,7 +762,7 @@ egg_list_box_real_enter_notify_event (GtkWidget *widget,
EggListBoxChildInfo *child; EggListBoxChildInfo *child;
if (event->window != gtk_widget_get_window ((GtkWidget*) list_box)) if (event->window != gtk_widget_get_window (GTK_WIDGET (list_box)))
return FALSE; return FALSE;
child = egg_list_box_find_child_at_y (list_box, event->y); child = egg_list_box_find_child_at_y (list_box, event->y);
@ -779,7 +779,7 @@ egg_list_box_real_leave_notify_event (GtkWidget *widget,
EggListBox *list_box = EGG_LIST_BOX (widget); EggListBox *list_box = EGG_LIST_BOX (widget);
EggListBoxChildInfo *child = NULL; EggListBoxChildInfo *child = NULL;
if (event->window != gtk_widget_get_window ((GtkWidget*) list_box)) if (event->window != gtk_widget_get_window (GTK_WIDGET (list_box)))
return FALSE; return FALSE;
if (event->detail != GDK_NOTIFY_INFERIOR) if (event->detail != GDK_NOTIFY_INFERIOR)
@ -823,7 +823,7 @@ egg_list_box_real_button_press_event (GtkWidget *widget,
{ {
priv->active_child = child; priv->active_child = child;
priv->active_child_active = TRUE; priv->active_child_active = TRUE;
gtk_widget_queue_draw ((GtkWidget*) list_box); gtk_widget_queue_draw (GTK_WIDGET (list_box));
if (event->type == GDK_2BUTTON_PRESS && if (event->type == GDK_2BUTTON_PRESS &&
!priv->activate_single_click && !priv->activate_single_click &&
child->widget != NULL) child->widget != NULL)
@ -858,7 +858,7 @@ egg_list_box_real_button_release_event (GtkWidget *widget,
} }
priv->active_child = NULL; priv->active_child = NULL;
priv->active_child_active = FALSE; priv->active_child_active = FALSE;
gtk_widget_queue_draw ((GtkWidget*) list_box); gtk_widget_queue_draw (GTK_WIDGET (list_box));
} }
return FALSE; return FALSE;
@ -891,7 +891,7 @@ egg_list_box_real_focus (GtkWidget* widget, GtkDirectionType direction)
recurse_into = NULL; recurse_into = NULL;
focus_into = TRUE; focus_into = TRUE;
g_object_get ((GtkWidget*) list_box, "has-focus", &had_focus, NULL); g_object_get (GTK_WIDGET (list_box), "has-focus", &had_focus, NULL);
current_focus_child = NULL; current_focus_child = NULL;
next_focus_child = NULL; next_focus_child = NULL;
if (had_focus) if (had_focus)
@ -989,7 +989,7 @@ egg_list_box_real_focus (GtkWidget* widget, GtkDirectionType direction)
{ {
if (direction == GTK_DIR_UP || direction == GTK_DIR_DOWN) if (direction == GTK_DIR_UP || direction == GTK_DIR_DOWN)
{ {
gtk_widget_error_bell ((GtkWidget*) list_box); gtk_widget_error_bell (GTK_WIDGET (list_box));
return TRUE; return TRUE;
} }
@ -1001,7 +1001,7 @@ egg_list_box_real_focus (GtkWidget* widget, GtkDirectionType direction)
{ {
GdkModifierType modify_mod_mask; GdkModifierType modify_mod_mask;
modify_mod_mask = modify_mod_mask =
gtk_widget_get_modifier_mask ((GtkWidget*) list_box, gtk_widget_get_modifier_mask (GTK_WIDGET (list_box),
GDK_MODIFIER_INTENT_MODIFY_SELECTION); GDK_MODIFIER_INTENT_MODIFY_SELECTION);
if ((state & modify_mod_mask) == modify_mod_mask) if ((state & modify_mod_mask) == modify_mod_mask)
modify_selection_pressed = TRUE; modify_selection_pressed = TRUE;
@ -1049,8 +1049,8 @@ egg_list_box_real_draw (GtkWidget* widget, cairo_t* cr)
gint flags_length; gint flags_length;
int i; int i;
gtk_widget_get_allocation ((GtkWidget*) list_box, &allocation); gtk_widget_get_allocation (GTK_WIDGET (list_box), &allocation);
context = gtk_widget_get_style_context ((GtkWidget*) list_box); context = gtk_widget_get_style_context (GTK_WIDGET (list_box));
gtk_render_background (context, cr, (gdouble) 0, (gdouble) 0, (gdouble) allocation.width, (gdouble) allocation.height); gtk_render_background (context, cr, (gdouble) 0, (gdouble) 0, (gdouble) allocation.width, (gdouble) allocation.height);
flags_length = 0; flags_length = 0;
@ -1081,7 +1081,7 @@ egg_list_box_real_draw (GtkWidget* widget, cairo_t* cr)
gtk_style_context_restore (context); gtk_style_context_restore (context);
} }
if (gtk_widget_has_visible_focus ((GtkWidget*) list_box) && priv->cursor_child != NULL) if (gtk_widget_has_visible_focus (GTK_WIDGET (list_box)) && priv->cursor_child != NULL)
gtk_render_focus (context, cr, 0, priv->cursor_child->y, allocation.width, priv->cursor_child->height); gtk_render_focus (context, cr, 0, priv->cursor_child->y, allocation.width, priv->cursor_child->height);
GTK_WIDGET_CLASS (egg_list_box_parent_class)->draw ((GtkWidget*) G_TYPE_CHECK_INSTANCE_CAST (list_box, GTK_TYPE_CONTAINER, GtkContainer), cr); GTK_WIDGET_CLASS (egg_list_box_parent_class)->draw ((GtkWidget*) G_TYPE_CHECK_INSTANCE_CAST (list_box, GTK_TYPE_CONTAINER, GtkContainer), cr);
@ -1098,24 +1098,24 @@ egg_list_box_real_realize (GtkWidget* widget)
GdkWindowAttr attributes = {0}; GdkWindowAttr attributes = {0};
GdkWindow *window; GdkWindow *window;
gtk_widget_get_allocation ((GtkWidget*) list_box, &allocation); gtk_widget_get_allocation (GTK_WIDGET (list_box), &allocation);
gtk_widget_set_realized ((GtkWidget*) list_box, TRUE); gtk_widget_set_realized (GTK_WIDGET (list_box), TRUE);
attributes.x = allocation.x; attributes.x = allocation.x;
attributes.y = allocation.y; attributes.y = allocation.y;
attributes.width = allocation.width; attributes.width = allocation.width;
attributes.height = allocation.height; attributes.height = allocation.height;
attributes.window_type = GDK_WINDOW_CHILD; attributes.window_type = GDK_WINDOW_CHILD;
attributes.event_mask = gtk_widget_get_events ((GtkWidget*) list_box) | attributes.event_mask = gtk_widget_get_events (GTK_WIDGET (list_box)) |
GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK | GDK_POINTER_MOTION_MASK | GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK | GDK_POINTER_MOTION_MASK |
GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK; GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK;
attributes.wclass = GDK_INPUT_OUTPUT; attributes.wclass = GDK_INPUT_OUTPUT;
window = gdk_window_new (gtk_widget_get_parent_window ((GtkWidget*) list_box), window = gdk_window_new (gtk_widget_get_parent_window (GTK_WIDGET (list_box)),
&attributes, GDK_WA_X | GDK_WA_Y); &attributes, GDK_WA_X | GDK_WA_Y);
gtk_style_context_set_background (gtk_widget_get_style_context ((GtkWidget*) list_box), window); gtk_style_context_set_background (gtk_widget_get_style_context (GTK_WIDGET (list_box)), window);
gdk_window_set_user_data (window, (GObject*) list_box); gdk_window_set_user_data (window, (GObject*) list_box);
gtk_widget_set_window ((GtkWidget*) list_box, window); /* Passes ownership */ gtk_widget_set_window (GTK_WIDGET (list_box), window); /* Passes ownership */
} }
@ -1162,7 +1162,6 @@ egg_list_box_get_first_visible (EggListBox *list_box)
EggListBoxPrivate *priv = list_box->priv; EggListBoxPrivate *priv = list_box->priv;
EggListBoxChildInfo *child_info; EggListBoxChildInfo *child_info;
GSequenceIter *iter; GSequenceIter *iter;
GtkWidget *child;
for (iter = g_sequence_get_begin_iter (priv->children); for (iter = g_sequence_get_begin_iter (priv->children);
!g_sequence_iter_is_end (iter); !g_sequence_iter_is_end (iter);
@ -1289,10 +1288,10 @@ egg_list_box_update_separator (EggListBox *list_box, GSequenceIter* iter)
if (info->separator != NULL) if (info->separator != NULL)
{ {
g_hash_table_insert (priv->separator_hash, info->separator, info); g_hash_table_insert (priv->separator_hash, info->separator, info);
gtk_widget_set_parent (info->separator, (GtkWidget*) list_box); gtk_widget_set_parent (info->separator, GTK_WIDGET (list_box));
gtk_widget_show (info->separator); gtk_widget_show (info->separator);
} }
gtk_widget_queue_resize ((GtkWidget*) list_box); gtk_widget_queue_resize (GTK_WIDGET (list_box));
} }
if (old_separator) if (old_separator)
g_object_unref (old_separator); g_object_unref (old_separator);
@ -1304,7 +1303,7 @@ egg_list_box_update_separator (EggListBox *list_box, GSequenceIter* iter)
g_hash_table_remove (priv->separator_hash, info->separator); g_hash_table_remove (priv->separator_hash, info->separator);
gtk_widget_unparent (info->separator); gtk_widget_unparent (info->separator);
g_clear_object (&info->separator); g_clear_object (&info->separator);
gtk_widget_queue_resize ((GtkWidget*) list_box); gtk_widget_queue_resize (GTK_WIDGET (list_box));
} }
} }
if (before_child) if (before_child)
@ -1326,7 +1325,7 @@ child_visibility_changed (GObject* object, GParamSpec* pspec, EggListBox *list_b
{ {
EggListBoxChildInfo *info; EggListBoxChildInfo *info;
if (gtk_widget_get_visible ((GtkWidget*) list_box)) if (gtk_widget_get_visible (GTK_WIDGET (list_box)))
{ {
info = egg_list_box_lookup_info (list_box, GTK_WIDGET (object)); info = egg_list_box_lookup_info (list_box, GTK_WIDGET (object));
if (info != NULL) if (info != NULL)
@ -1354,9 +1353,9 @@ egg_list_box_real_add (GtkContainer* container, GtkWidget* child)
iter = g_sequence_append (priv->children, info); iter = g_sequence_append (priv->children, info);
info->iter = iter; info->iter = iter;
gtk_widget_set_parent (child, (GtkWidget*) list_box); gtk_widget_set_parent (child, GTK_WIDGET (list_box));
egg_list_box_apply_filter (list_box, child); egg_list_box_apply_filter (list_box, child);
if (gtk_widget_get_visible ((GtkWidget*) list_box)) if (gtk_widget_get_visible (GTK_WIDGET (list_box)))
{ {
egg_list_box_update_separator (list_box, iter); egg_list_box_update_separator (list_box, iter);
egg_list_box_update_separator (list_box, egg_list_box_get_next_visible (list_box, iter)); egg_list_box_update_separator (list_box, egg_list_box_get_next_visible (list_box, iter));
@ -1388,8 +1387,8 @@ egg_list_box_real_remove (GtkContainer* container, GtkWidget* child)
g_hash_table_remove (priv->separator_hash, child); g_hash_table_remove (priv->separator_hash, child);
g_clear_object (&info->separator); g_clear_object (&info->separator);
gtk_widget_unparent (child); gtk_widget_unparent (child);
if (was_visible && gtk_widget_get_visible ((GtkWidget*) list_box)) if (was_visible && gtk_widget_get_visible (GTK_WIDGET (list_box)))
gtk_widget_queue_resize ((GtkWidget*) list_box); gtk_widget_queue_resize (GTK_WIDGET (list_box));
} }
else else
{ {
@ -1418,11 +1417,11 @@ egg_list_box_real_remove (GtkContainer* container, GtkWidget* child)
gtk_widget_unparent (child); gtk_widget_unparent (child);
g_hash_table_remove (priv->child_hash, child); g_hash_table_remove (priv->child_hash, child);
g_sequence_remove (info->iter); g_sequence_remove (info->iter);
if (gtk_widget_get_visible ((GtkWidget*) list_box)) if (gtk_widget_get_visible (GTK_WIDGET (list_box)))
egg_list_box_update_separator (list_box, next); egg_list_box_update_separator (list_box, next);
if (was_visible && gtk_widget_get_visible ((GtkWidget*) list_box)) if (was_visible && gtk_widget_get_visible (GTK_WIDGET (list_box)))
gtk_widget_queue_resize ((GtkWidget*) list_box); gtk_widget_queue_resize (GTK_WIDGET (list_box));
} }
@ -1499,7 +1498,7 @@ egg_list_box_real_get_preferred_height_for_width (GtkWidget* widget, gint width,
minimum_height = 0; minimum_height = 0;
context = gtk_widget_get_style_context ((GtkWidget*) list_box); context = gtk_widget_get_style_context (GTK_WIDGET (list_box));
gtk_style_context_get_style (context, gtk_style_context_get_style (context,
"focus-line-width", &focus_width, "focus-line-width", &focus_width,
"focus-padding", &focus_pad, NULL); "focus-padding", &focus_pad, NULL);
@ -1555,7 +1554,7 @@ egg_list_box_real_get_preferred_width (GtkWidget* widget, gint* minimum_width_ou
gint child_min; gint child_min;
gint child_nat; gint child_nat;
context = gtk_widget_get_style_context ((GtkWidget*) list_box); context = gtk_widget_get_style_context (GTK_WIDGET (list_box));
gtk_style_context_get_style (context, "focus-line-width", &focus_width, "focus-padding", &focus_pad, NULL); gtk_style_context_get_style (context, "focus-line-width", &focus_width, "focus-padding", &focus_pad, NULL);
minimum_width = 0; minimum_width = 0;
@ -1593,7 +1592,7 @@ egg_list_box_real_get_preferred_width_for_height (GtkWidget *widget, gint height
gint *minimum_width, gint *natural_width) gint *minimum_width, gint *natural_width)
{ {
EggListBox *list_box = EGG_LIST_BOX (widget); EggListBox *list_box = EGG_LIST_BOX (widget);
egg_list_box_real_get_preferred_width ((GtkWidget*) list_box, minimum_width, natural_width); egg_list_box_real_get_preferred_width (GTK_WIDGET (list_box), minimum_width, natural_width);
} }
static void static void
@ -1623,14 +1622,14 @@ egg_list_box_real_size_allocate (GtkWidget *widget, GtkAllocation *allocation)
separator_allocation.width = 0; separator_allocation.width = 0;
separator_allocation.height = 0; separator_allocation.height = 0;
gtk_widget_set_allocation ((GtkWidget*) list_box, allocation); gtk_widget_set_allocation (GTK_WIDGET (list_box), allocation);
window = gtk_widget_get_window ((GtkWidget*) list_box); window = gtk_widget_get_window (GTK_WIDGET (list_box));
if (window != NULL) if (window != NULL)
gdk_window_move_resize (window, gdk_window_move_resize (window,
allocation->x, allocation->y, allocation->x, allocation->y,
allocation->width, allocation->height); allocation->width, allocation->height);
context = gtk_widget_get_style_context ((GtkWidget*) list_box); context = gtk_widget_get_style_context (GTK_WIDGET (list_box));
gtk_style_context_get_style (context, gtk_style_context_get_style (context,
"focus-line-width", &focus_width, "focus-line-width", &focus_width,
"focus-padding", &focus_pad, "focus-padding", &focus_pad,
@ -1844,7 +1843,7 @@ egg_list_box_real_move_cursor (EggListBox *list_box,
if (gtk_get_current_event_state (&state)) if (gtk_get_current_event_state (&state))
{ {
modify_mod_mask = gtk_widget_get_modifier_mask ((GtkWidget*) list_box, modify_mod_mask = gtk_widget_get_modifier_mask (GTK_WIDGET (list_box),
GDK_MODIFIER_INTENT_MODIFY_SELECTION); GDK_MODIFIER_INTENT_MODIFY_SELECTION);
if ((state & modify_mod_mask) == modify_mod_mask) if ((state & modify_mod_mask) == modify_mod_mask)
modify_selection_pressed = TRUE; modify_selection_pressed = TRUE;
@ -1936,7 +1935,7 @@ egg_list_box_real_move_cursor (EggListBox *list_box,
if (child == NULL) if (child == NULL)
{ {
gtk_widget_error_bell ((GtkWidget*) list_box); gtk_widget_error_bell (GTK_WIDGET (list_box));
return; return;
} }