diff options
| author | Timm Bäder <mail@baedert.org> | 2015-10-16 14:44:16 +0200 |
|---|---|---|
| committer | Timm Bäder <mail@baedert.org> | 2015-10-16 15:07:53 +0200 |
| commit | 944ef8bb0b6205097e48f209baf1195a3c1e8fc7 (patch) | |
| tree | c7f8d618690f23e73182eba447cb20e9637a2ebd /gtk/gtkpaned.c | |
| parent | d0779db1e18db77d6aecd3532b299da0a9edad3c (diff) | |
| download | gtk+-944ef8bb0b6205097e48f209baf1195a3c1e8fc7.tar.gz | |
GtkPaned: Fix gtk_paned_set_child_visible calls
Use CHILD1/CHILD2 instead of 0 and 1, always use the same order and
don't check for child NULL-ness, because it will be done in
gtk_paned_set_child_visible anyways.
Diffstat (limited to 'gtk/gtkpaned.c')
| -rw-r--r-- | gtk/gtkpaned.c | 23 |
1 files changed, 8 insertions, 15 deletions
diff --git a/gtk/gtkpaned.c b/gtk/gtkpaned.c index f9fb9786aa..e684edbd85 100644 --- a/gtk/gtkpaned.c +++ b/gtk/gtkpaned.c @@ -1484,9 +1484,8 @@ gtk_paned_size_allocate (GtkWidget *widget, if (priv->child1 && gtk_widget_get_visible (priv->child1)) { - gtk_paned_set_child_visible (paned, 0, TRUE); - if (priv->child2) - gtk_paned_set_child_visible (paned, 1, FALSE); + gtk_paned_set_child_visible (paned, CHILD1, TRUE); + gtk_paned_set_child_visible (paned, CHILD2, FALSE); gtk_paned_child_allocate (priv->child1, priv->child1_window, @@ -1495,9 +1494,8 @@ gtk_paned_size_allocate (GtkWidget *widget, } else if (priv->child2 && gtk_widget_get_visible (priv->child2)) { - gtk_paned_set_child_visible (paned, 1, TRUE); - if (priv->child1) - gtk_paned_set_child_visible (paned, 0, FALSE); + gtk_paned_set_child_visible (paned, CHILD1, FALSE); + gtk_paned_set_child_visible (paned, CHILD2, TRUE); gtk_paned_child_allocate (priv->child2, priv->child2_window, @@ -1506,10 +1504,8 @@ gtk_paned_size_allocate (GtkWidget *widget, } else { - if (priv->child1) - gtk_paned_set_child_visible (paned, 0, FALSE); - if (priv->child2) - gtk_paned_set_child_visible (paned, 1, FALSE); + gtk_paned_set_child_visible (paned, CHILD1, FALSE); + gtk_paned_set_child_visible (paned, CHILD2, FALSE); } } } @@ -2212,11 +2208,8 @@ gtk_paned_calc_position (GtkPaned *paned, &priv->min_position, &priv->max_position, &priv->child1_size); - if (priv->child1) - gtk_paned_set_child_visible (paned, 0, priv->child1_size != 0); - - if (priv->child2) - gtk_paned_set_child_visible (paned, 1, priv->child1_size != allocation); + gtk_paned_set_child_visible (paned, CHILD1, priv->child1_size != 0); + gtk_paned_set_child_visible (paned, CHILD2, priv->child1_size != allocation); g_object_freeze_notify (G_OBJECT (paned)); if (priv->child1_size != old_position) |