treeview: fix a critical warning

[~andy/gtk] / gtk / gtktreeview.c

diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index f6885277c3cef89448b137f5e2f7b5571d8b2919..21873d775bd3c34d8ba9c3aad8f482dce97d4ee5 100644 (file)
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -239,7 +239,6 @@ typedef enum {
 #define GTK_TREE_VIEW_PRIORITY_SCROLL_SYNC (GTK_TREE_VIEW_PRIORITY_VALIDATE + 2)
 #define GTK_TREE_VIEW_TIME_MS_PER_IDLE 30
 #define SCROLL_EDGE_SIZE 15
-#define EXPANDER_EXTRA_PADDING 4
 #define GTK_TREE_VIEW_SEARCH_DIALOG_TIMEOUT 5000
 #define AUTO_EXPAND_TIMEOUT 500
 
@@ -2212,6 +2211,9 @@ gtk_tree_view_ensure_background (GtkTreeView *tree_view)
   GtkStyleContext *context;
 
   context = gtk_widget_get_style_context (GTK_WIDGET (tree_view));
+
+  gtk_style_context_set_background (context, tree_view->priv->bin_window);
+  gtk_style_context_set_background (context, gtk_widget_get_window (GTK_WIDGET (tree_view)));
   gtk_style_context_set_background (context, tree_view->priv->header_window);
 }
 
@@ -2244,7 +2246,7 @@ gtk_tree_view_realize (GtkWidget *widget)
   window = gdk_window_new (gtk_widget_get_parent_window (widget),
                            &attributes, attributes_mask);
   gtk_widget_set_window (widget, window);
-  gdk_window_set_user_data (window, widget);
+  gtk_widget_register_window (widget, window);
 
   gtk_widget_get_allocation (widget, &allocation);
 
@@ -2265,7 +2267,7 @@ gtk_tree_view_realize (GtkWidget *widget)
 
   tree_view->priv->bin_window = gdk_window_new (window,
                                                &attributes, attributes_mask);
-  gdk_window_set_user_data (tree_view->priv->bin_window, widget);
+  gtk_widget_register_window (widget, tree_view->priv->bin_window);
 
   gtk_widget_get_allocation (widget, &allocation);
 
@@ -2286,7 +2288,7 @@ gtk_tree_view_realize (GtkWidget *widget)
 
   tree_view->priv->header_window = gdk_window_new (window,
                                                   &attributes, attributes_mask);
-  gdk_window_set_user_data (tree_view->priv->header_window, widget);
+  gtk_widget_register_window (widget, tree_view->priv->header_window);
 
   gtk_tree_view_ensure_background (tree_view);
 
@@ -2361,24 +2363,24 @@ gtk_tree_view_unrealize (GtkWidget *widget)
   for (list = priv->columns; list; list = list->next)
     _gtk_tree_view_column_unrealize_button (GTK_TREE_VIEW_COLUMN (list->data));
 
-  gdk_window_set_user_data (priv->bin_window, NULL);
+  gtk_widget_unregister_window (widget, priv->bin_window);
   gdk_window_destroy (priv->bin_window);
   priv->bin_window = NULL;
 
-  gdk_window_set_user_data (priv->header_window, NULL);
+  gtk_widget_unregister_window (widget, priv->header_window);
   gdk_window_destroy (priv->header_window);
   priv->header_window = NULL;
 
   if (priv->drag_window)
     {
-      gdk_window_set_user_data (priv->drag_window, NULL);
+      gtk_widget_unregister_window (widget, priv->drag_window);
       gdk_window_destroy (priv->drag_window);
       priv->drag_window = NULL;
     }
 
   if (priv->drag_highlight_window)
     {
-      gdk_window_set_user_data (priv->drag_highlight_window, NULL);
+      gtk_widget_unregister_window (widget, priv->drag_highlight_window);
       gdk_window_destroy (priv->drag_highlight_window);
       priv->drag_highlight_window = NULL;
     }
@@ -2479,6 +2481,7 @@ gtk_tree_view_modify_column_width (GtkTreeView       *tree_view,
   gboolean is_expand;
   gint n_expand_others;
   gint minimum, natural, natural_others;
+  gint expand;
 
   is_expand = gtk_tree_view_column_get_expand (column);
   n_expand_others = tree_view->priv->n_expand_columns - (is_expand ? 1 : 0);
@@ -2516,7 +2519,7 @@ gtk_tree_view_modify_column_width (GtkTreeView       *tree_view,
        * It is possible for the solved natural width to be less than the
        * minimum; in that case, we cannot let the column expand.
        */
-      gint expand = (tree_view->priv->width - natural_others - width) / n_expand_others;
+      expand = (tree_view->priv->width - natural_others - width) / n_expand_others;
 
       if (minimum + expand > width)
        {
@@ -2861,13 +2864,14 @@ static int
 gtk_tree_view_get_expander_size (GtkTreeView *tree_view)
 {
   gint expander_size;
+  gint horizontal_separator;
 
   gtk_widget_style_get (GTK_WIDGET (tree_view),
                        "expander-size", &expander_size,
+                        "horizontal-separator", &horizontal_separator,
                        NULL);
-  expander_size += EXPANDER_EXTRA_PADDING;
 
-  return expander_size;
+  return expander_size + (horizontal_separator / 2);
 }
 
 static gboolean
@@ -3343,6 +3347,7 @@ gtk_tree_view_button_release_drag_column (GtkWidget      *widget,
                                         tree_view->priv->cur_reorder->left_column);
     }
   tree_view->priv->drag_column = NULL;
+  gtk_widget_unregister_window (widget, tree_view->priv->drag_window);
   gdk_window_destroy (tree_view->priv->drag_window);
   tree_view->priv->drag_window = NULL;
 
@@ -3803,8 +3808,7 @@ gtk_tree_view_motion_draw_column_motion_arrow (GtkTreeView *tree_view)
 
          if (tree_view->priv->drag_highlight_window)
            {
-             gdk_window_set_user_data (tree_view->priv->drag_highlight_window,
-                                       NULL);
+             gtk_widget_unregister_window (GTK_WIDGET (tree_view), tree_view->priv->drag_highlight_window);
              gdk_window_destroy (tree_view->priv->drag_highlight_window);
            }
 
@@ -3820,7 +3824,7 @@ gtk_tree_view_motion_draw_column_motion_arrow (GtkTreeView *tree_view)
          attributes.event_mask = GDK_VISIBILITY_NOTIFY_MASK | GDK_EXPOSURE_MASK | GDK_POINTER_MOTION_MASK;
          attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL;
          tree_view->priv->drag_highlight_window = gdk_window_new (tree_view->priv->header_window, &attributes, attributes_mask);
-         gdk_window_set_user_data (tree_view->priv->drag_highlight_window, GTK_WIDGET (tree_view));
+         gtk_widget_register_window (GTK_WIDGET (tree_view), tree_view->priv->drag_highlight_window);
 
          mask_image = cairo_image_surface_create (CAIRO_FORMAT_A1, width, height);
           cr = cairo_create (mask_image);
@@ -3870,8 +3874,7 @@ gtk_tree_view_motion_draw_column_motion_arrow (GtkTreeView *tree_view)
        {
          if (tree_view->priv->drag_highlight_window)
            {
-             gdk_window_set_user_data (tree_view->priv->drag_highlight_window,
-                                       NULL);
+             gtk_widget_unregister_window (GTK_WIDGET (tree_view), tree_view->priv->drag_highlight_window);
              gdk_window_destroy (tree_view->priv->drag_highlight_window);
            }
 
@@ -3886,7 +3889,7 @@ gtk_tree_view_motion_draw_column_motion_arrow (GtkTreeView *tree_view)
          attributes.height = height;
          tree_view->priv->drag_highlight_window = gdk_window_new (gtk_widget_get_root_window (widget),
                                                                   &attributes, attributes_mask);
-         gdk_window_set_user_data (tree_view->priv->drag_highlight_window, GTK_WIDGET (tree_view));
+         gtk_widget_register_window (GTK_WIDGET (tree_view), tree_view->priv->drag_highlight_window);
 
          mask_image = cairo_image_surface_create (CAIRO_FORMAT_A1, width, height);
 
@@ -3952,8 +3955,7 @@ gtk_tree_view_motion_draw_column_motion_arrow (GtkTreeView *tree_view)
        {
          if (tree_view->priv->drag_highlight_window)
            {
-             gdk_window_set_user_data (tree_view->priv->drag_highlight_window,
-                                       NULL);
+             gtk_widget_unregister_window (GTK_WIDGET (tree_view), tree_view->priv->drag_highlight_window);
              gdk_window_destroy (tree_view->priv->drag_highlight_window);
            }
 
@@ -3967,7 +3969,7 @@ gtk_tree_view_motion_draw_column_motion_arrow (GtkTreeView *tree_view)
          attributes.width = width;
          attributes.height = height;
          tree_view->priv->drag_highlight_window = gdk_window_new (gtk_widget_get_root_window (widget), &attributes, attributes_mask);
-         gdk_window_set_user_data (tree_view->priv->drag_highlight_window, GTK_WIDGET (tree_view));
+         gtk_widget_register_window (GTK_WIDGET (tree_view), tree_view->priv->drag_highlight_window);
 
          mask_image = cairo_image_surface_create (CAIRO_FORMAT_A1, width, height);
 
@@ -9238,12 +9240,19 @@ gtk_tree_view_get_arrow_xrange (GtkTreeView *tree_view,
   GList *list;
   GtkTreeViewColumn *tmp_column = NULL;
   gint total_width;
-  gint expander_size;
+  gint expander_size, expander_render_size;
+  gint horizontal_separator;
   gboolean indent_expanders;
   gboolean rtl;
 
+  gtk_widget_style_get (GTK_WIDGET (tree_view),
+                       "indent-expanders", &indent_expanders,
+                        "horizontal-separator", &horizontal_separator,
+                       NULL);
+
   rtl = (gtk_widget_get_direction (GTK_WIDGET (tree_view)) == GTK_TEXT_DIR_RTL);
   expander_size = gtk_tree_view_get_expander_size (tree_view);
+  expander_render_size = expander_size - (horizontal_separator / 2);
 
   total_width = 0;
   for (list = (rtl ? g_list_last (tree_view->priv->columns) : g_list_first (tree_view->priv->columns));
@@ -9265,9 +9274,7 @@ gtk_tree_view_get_arrow_xrange (GtkTreeView *tree_view,
         total_width += gtk_tree_view_column_get_width (tmp_column);
     }
 
-  gtk_widget_style_get (GTK_WIDGET (tree_view),
-                       "indent-expanders", &indent_expanders,
-                       NULL);
+  x_offset += (expander_size - expander_render_size);
 
   if (indent_expanders)
     {
@@ -9282,7 +9289,7 @@ gtk_tree_view_get_arrow_xrange (GtkTreeView *tree_view,
   if (tmp_column &&
       gtk_tree_view_column_get_visible (tmp_column))
     /* +1 because x2 isn't included in the range. */
-    *x2 = *x1 + expander_size + 1;
+    *x2 = *x1 + expander_render_size + 1;
   else
     *x2 = *x1;
 }
@@ -9811,7 +9818,7 @@ _gtk_tree_view_column_start_drag (GtkTreeView       *tree_view,
   tree_view->priv->drag_window = gdk_window_new (tree_view->priv->header_window,
                                                  &attributes,
                                                  attributes_mask);
-  gdk_window_set_user_data (tree_view->priv->drag_window, GTK_WIDGET (tree_view));
+  gtk_widget_register_window (GTK_WIDGET (tree_view), tree_view->priv->drag_window);
 
   if (gdk_device_get_source (device) == GDK_SOURCE_KEYBOARD)
     {
@@ -10081,7 +10088,6 @@ gtk_tree_view_draw_arrow (GtkTreeView *tree_view,
   gint x_offset = 0;
   gint x2;
   gint vertical_separator;
-  gint expander_size;
   GtkCellRendererState flags = 0;
 
   widget = GTK_WIDGET (tree_view);
@@ -10090,7 +10096,6 @@ gtk_tree_view_draw_arrow (GtkTreeView *tree_view,
   gtk_widget_style_get (widget,
                         "vertical-separator", &vertical_separator,
                         NULL);
-  expander_size = gtk_tree_view_get_expander_size (tree_view) - EXPANDER_EXTRA_PADDING;
 
   if (! GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_IS_PARENT))
     return;
@@ -10100,7 +10105,7 @@ gtk_tree_view_draw_arrow (GtkTreeView *tree_view,
   area.x = x_offset;
   area.y = gtk_tree_view_get_cell_area_y_offset (tree_view, tree, node,
                                                  vertical_separator);
-  area.width = expander_size;
+  area.width = x2 - x_offset;
   area.height = gtk_tree_view_get_cell_area_height (tree_view, node,
                                                     vertical_separator);
 
@@ -11835,25 +11840,25 @@ gtk_tree_view_get_rules_hint (GtkTreeView  *tree_view)
 /**
  * gtk_tree_view_set_activate_on_single_click:
  * @tree_view: a #GtkTreeView
- * @setting: %TRUE to emit row-activated on a single click
+ * @single: %TRUE to emit row-activated on a single click
  *
- * Cause the "row-activated" signal to be emitted on a single click
- * instead of a double click.
+ * Cause the #GtkTreeView::row-activated signal to be emitted
+ * on a single click instead of a double click.
  *
  * Since: 3.8
  **/
 void
-gtk_tree_view_set_activate_on_single_click  (GtkTreeView *tree_view,
-                                             gboolean     setting)
+gtk_tree_view_set_activate_on_single_click (GtkTreeView *tree_view,
+                                            gboolean     single)
 {
   g_return_if_fail (GTK_IS_TREE_VIEW (tree_view));
 
-  setting = setting != FALSE;
+  single = single != FALSE;
 
-  if (tree_view->priv->activate_on_single_click == setting)
+  if (tree_view->priv->activate_on_single_click == single)
     return;
 
-  tree_view->priv->activate_on_single_click = setting;
+  tree_view->priv->activate_on_single_click = single;
   g_object_notify (G_OBJECT (tree_view), "activate-on-single-click");
 }
 
@@ -11868,7 +11873,7 @@ gtk_tree_view_set_activate_on_single_click  (GtkTreeView *tree_view,
  * Since: 3.8
  **/
 gboolean
-gtk_tree_view_get_activate_on_single_click  (GtkTreeView *tree_view)
+gtk_tree_view_get_activate_on_single_click (GtkTreeView *tree_view)
 {
   g_return_val_if_fail (GTK_IS_TREE_VIEW (tree_view), FALSE);
 
@@ -11960,8 +11965,6 @@ gtk_tree_view_remove_column (GtkTreeView       *tree_view,
                                         G_CALLBACK (column_sizing_notify),
                                         tree_view);
 
-  _gtk_tree_view_column_unset_tree_view (column);
-
   position = g_list_index (tree_view->priv->columns, column);
 
   tree_view->priv->columns = g_list_remove (tree_view->priv->columns, column);
@@ -11989,7 +11992,7 @@ gtk_tree_view_remove_column (GtkTreeView       *tree_view,
     }
 
   _gtk_tree_view_reset_header_styles (tree_view);
-
+  _gtk_tree_view_column_unset_tree_view (column);
   _gtk_tree_view_accessible_remove_column (tree_view, column, position);
 
   g_object_unref (column);