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

treeview: Update adjustment usage for sealing

Browse Source 
Use gtk_adjustment_set_upper() instead of doing its work manually.
This commit is contained in:
Benjamin Otte
2011-01-05 13:58:28 +01:00
parent e93eb20794
commit 6ff585e189
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
gtk/gtktreeview.c
View File

@ -6572,10 +6572,10 @@ validate_visible_area (GtkTreeView *tree_view)
gtk_widget_get_preferred_size (GTK_WIDGET (tree_view), gtk_widget_get_preferred_size (GTK_WIDGET (tree_view),
&requisition, NULL); &requisition, NULL);
tree_view->priv->hadjustment->upper = MAX (tree_view->priv->hadjustment->upper, (gfloat)requisition.width); gtk_adjustment_set_upper (tree_view->priv->hadjustment,
tree_view->priv->vadjustment->upper = MAX (tree_view->priv->vadjustment->upper, (gfloat)requisition.height); MAX (gtk_adjustment_get_upper (tree_view->priv->hadjustment), requisition.width));
gtk_adjustment_changed (tree_view->priv->hadjustment); gtk_adjustment_set_upper (tree_view->priv->vadjustment,
gtk_adjustment_changed (tree_view->priv->vadjustment); MAX (gtk_adjustment_get_upper (tree_view->priv->vadjustment), requisition.height));
gtk_widget_queue_resize (GTK_WIDGET (tree_view)); gtk_widget_queue_resize (GTK_WIDGET (tree_view));
} }
@ -6772,10 +6772,10 @@ do_validate_rows (GtkTreeView *tree_view, gboolean queue_resize)
*/ */
gtk_tree_view_size_request (GTK_WIDGET (tree_view), &requisition, FALSE); gtk_tree_view_size_request (GTK_WIDGET (tree_view), &requisition, FALSE);
tree_view->priv->hadjustment->upper = MAX (tree_view->priv->hadjustment->upper, (gfloat)requisition.width); gtk_adjustment_set_upper (tree_view->priv->hadjustment,
tree_view->priv->vadjustment->upper = MAX (tree_view->priv->vadjustment->upper, (gfloat)requisition.height); MAX (gtk_adjustment_get_upper (tree_view->priv->hadjustment), requisition.width));
gtk_adjustment_changed (tree_view->priv->hadjustment); gtk_adjustment_set_upper (tree_view->priv->vadjustment,
gtk_adjustment_changed (tree_view->priv->vadjustment); MAX (gtk_adjustment_get_upper (tree_view->priv->vadjustment), requisition.height));
if (queue_resize) if (queue_resize)
gtk_widget_queue_resize (GTK_WIDGET (tree_view)); gtk_widget_queue_resize (GTK_WIDGET (tree_view));
@ -6837,10 +6837,10 @@ do_presize_handler (GtkTreeView *tree_view)
gtk_widget_get_preferred_size (GTK_WIDGET (tree_view), gtk_widget_get_preferred_size (GTK_WIDGET (tree_view),
&requisition, NULL); &requisition, NULL);
tree_view->priv->hadjustment->upper = MAX (tree_view->priv->hadjustment->upper, (gfloat)requisition.width); gtk_adjustment_set_upper (tree_view->priv->hadjustment,
tree_view->priv->vadjustment->upper = MAX (tree_view->priv->vadjustment->upper, (gfloat)requisition.height); MAX (gtk_adjustment_get_upper (tree_view->priv->hadjustment), requisition.width));
gtk_adjustment_changed (tree_view->priv->hadjustment); gtk_adjustment_set_upper (tree_view->priv->vadjustment,
gtk_adjustment_changed (tree_view->priv->vadjustment); MAX (gtk_adjustment_get_upper (tree_view->priv->vadjustment), requisition.height));
gtk_widget_queue_resize (GTK_WIDGET (tree_view)); gtk_widget_queue_resize (GTK_WIDGET (tree_view));
} }