[egg-list-box/flow-box-enhancements] Cosmetics
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [egg-list-box/flow-box-enhancements] Cosmetics
- Date: Sat, 28 Sep 2013 21:17:16 +0000 (UTC)
commit e5503edfb665163c2479c8e7714325246a7be62f
Author: Matthias Clasen <mclasen redhat com>
Date: Sat Sep 28 14:49:23 2013 -0400
Cosmetics
Shorten some parameter names.
egg-flow-box.c | 31 +++++++++++++------------------
1 files changed, 13 insertions(+), 18 deletions(-)
---
diff --git a/egg-flow-box.c b/egg-flow-box.c
index 18c663b..5352b54 100644
--- a/egg-flow-box.c
+++ b/egg-flow-box.c
@@ -376,8 +376,8 @@ egg_flow_box_child_get_full_border (EggFlowBoxChild *child,
static void
egg_flow_box_child_get_preferred_height_for_width (GtkWidget *widget,
gint width,
- gint *minimum_height_out,
- gint *natural_height_out)
+ gint *minimum_height,
+ gint *natural_height)
{
GtkWidget *child;
gint child_min = 0, child_natural = 0;
@@ -390,16 +390,16 @@ egg_flow_box_child_get_preferred_height_for_width (GtkWidget *widget,
gtk_widget_get_preferred_height_for_width (child, width - full_border.left - full_border.right,
&child_min, &child_natural);
- if (minimum_height_out)
- *minimum_height_out = full_border.top + child_min + full_border.bottom;
- if (natural_height_out)
- *natural_height_out = full_border.top + child_natural + full_border.bottom;
+ if (minimum_height)
+ *minimum_height = full_border.top + child_min + full_border.bottom;
+ if (natural_height)
+ *natural_height = full_border.top + child_natural + full_border.bottom;
}
static void
egg_flow_box_child_get_preferred_width (GtkWidget *widget,
- gint *minimum_width_out,
- gint *natural_width_out)
+ gint *minimum_width,
+ gint *natural_width)
{
GtkWidget *child;
gint child_min = 0, child_natural = 0;
@@ -412,10 +412,10 @@ egg_flow_box_child_get_preferred_width (GtkWidget *widget,
gtk_widget_get_preferred_width (child,
&child_min, &child_natural);
- if (minimum_width_out)
- *minimum_width_out = full_border.left + child_min + full_border.right;
- if (natural_width_out)
- *natural_width_out = full_border.left + child_natural + full_border.bottom;
+ if (minimum_width)
+ *minimum_width = full_border.left + child_min + full_border.right;
+ if (natural_width)
+ *natural_width = full_border.left + child_natural + full_border.bottom;
}
static void
@@ -2691,16 +2691,11 @@ static void
egg_flow_box_select_and_activate (EggFlowBox *box,
EggFlowBoxChild *child)
{
- GtkWidget *w = NULL;
-
if (child != NULL)
{
- w = gtk_bin_get_child (GTK_BIN (child));
egg_flow_box_select_child_info (box, child);
+ g_signal_emit (box, signals[CHILD_ACTIVATED], 0, child);
}
-
- if (w != NULL)
- g_signal_emit (box, signals[CHILD_ACTIVATED], 0, w);
}
static gboolean
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]