+ Add a new sizing fix for the case where there is a scrollbar.

* 034_gtkcupsutils_type_fix.patch: type-casting fix from Herbert * 040_filechooser_single-click.patch: allow a situation where no shortcut is selected, to avoid issues for keyboard users. Closes: #448674. * 042_treeview_single_focus.patch: don't select the focused item for GTK_SELECTION_SINGLE type treeviews. Allows the fix in 040_filechooser_single-click.patch to work.
2007-11-01 12:55:49 +00:00
parent f74722b10d
commit a8ca13388f
5 changed files with 70 additions and 30 deletions
--- a/debian/changelog
+++ b/debian/changelog
@ -7,12 +7,19 @@ gtk+2.0 (2.12.1-2) UNRELEASED; urgency=low
  * Keep --enable-explicit-deps in the directfb build; otherwise this
    breaks any binary linking against it because the rpath isn't passed.
  * 033_treeview_resizing.patch: updated patch from Kristian Rietveld.
+    + Add a new sizing fix for the case where there is a scrollbar.
  * 031_gtksearchenginetracker_fixes.patch: added back, only the name
    change was fixed upstream.
-  * 034_gtkcupsutils_type_fix.patch: type-casting fix from Herbert 
+  * 034_gtkcupsutils_type_fix.patch: type-casting fix from Herbert
    Valerio Riedel that allows remote printing. Closes: #448071.
+  * 040_filechooser_single-click.patch: allow a situation where no
+    shortcut is selected, to avoid issues for keyboard users.
+    Closes: #448674.
+  * 042_treeview_single_focus.patch: don't select the focused item for
+    GTK_SELECTION_SINGLE type treeviews. Allows the fix in
+    040_filechooser_single-click.patch to work.

- -- Josselin Mouette <joss@debian.org>  Thu, 01 Nov 2007 00:57:30 +0100
+ -- Josselin Mouette <joss@debian.org>  Thu, 01 Nov 2007 12:11:38 +0100

 gtk+2.0 (2.12.1-1) unstable; urgency=low

--- a/debian/patches/033_treeview_resizing.patch
+++ b/debian/patches/033_treeview_resizing.patch
@ -1,16 +1,8 @@
 Index: gtk+-2.12.1/gtk/gtktreeview.c
 ===================================================================
--- gtk+-2.12.1.orig/gtk/gtktreeview.c	2007-10-16 15:20:39.000000000 +0200
-+++ gtk+-2.12.1/gtk/gtktreeview.c	2007-10-31 19:32:10.309114837 +0100
-@@ -1993,6 +1993,7 @@
- 
-   tree_view->priv->prev_width = tree_view->priv->width;  
-   tree_view->priv->width = 0;
-+
-   /* keep this in sync with size_allocate below */
-   for (list = tree_view->priv->columns, i = 0; list; list = list->next, i++)
-     {
-@@ -2159,18 +2160,20 @@
+--- gtk+-2.12.1.orig/gtk/gtktreeview.c	2007-11-01 12:04:42.371958388 +0100
+++ gtk+-2.12.1/gtk/gtktreeview.c	2007-11-01 13:42:24.766037188 +0100
+@@ -2159,18 +2159,20 @@ gtk_tree_view_get_real_requested_width_f
 
 /* GtkWidget::size_allocate helper */
 static void
@ -33,7 +25,7 @@ Index: gtk+-2.12.1/gtk/gtktreeview.c
   
   tree_view = GTK_TREE_VIEW (widget);
 
-@@ -2205,12 +2208,38 @@
+@@ -2205,12 +2207,38 @@ gtk_tree_view_size_allocate_columns (Gtk
 	number_of_expand_columns++;
     }
 
@ -73,7 +65,7 @@ Index: gtk+-2.12.1/gtk/gtktreeview.c
   for (list = (rtl ? last_column : first_column); 
        list != (rtl ? first_column->prev : last_column->next);
        list = (rtl ? list->prev : list->next)) 
-@@ -2266,6 +2295,12 @@
+@@ -2266,6 +2294,12 @@ gtk_tree_view_size_allocate_columns (Gtk
 	  column->width += extra;
 	}
 
@ -86,7 +78,7 @@ Index: gtk+-2.12.1/gtk/gtktreeview.c
       g_object_notify (G_OBJECT (column), "width");
 
       allocation.width = column->width;
-@@ -2283,6 +2318,14 @@
+@@ -2283,6 +2317,14 @@ gtk_tree_view_size_allocate_columns (Gtk
                                 TREE_VIEW_DRAG_WIDTH, allocation.height);
     }
 
@ -101,7 +93,24 @@ Index: gtk+-2.12.1/gtk/gtktreeview.c
   if (column_changed)
     gtk_widget_queue_draw (GTK_WIDGET (tree_view));
 }
-@@ -2323,6 +2366,7 @@
+@@ -2299,13 +2341,13 @@ gtk_tree_view_size_allocate (GtkWidget  
+ 
+   g_return_if_fail (GTK_IS_TREE_VIEW (widget));
+ 
+-  if (allocation->width != widget->allocation.width)
+-    width_changed = TRUE;
+-  
+   widget->allocation = *allocation;
+ 
+   tree_view = GTK_TREE_VIEW (widget);
+ 
+  if (allocation->width != old_width || tree_view->priv->width != tree_view->priv->prev_width)
+    width_changed = TRUE;
+
+   tmp_list = tree_view->priv->children;
+ 
+   while (tmp_list)
+@@ -2323,6 +2365,7 @@ gtk_tree_view_size_allocate (GtkWidget  
       gtk_widget_size_allocate (child->widget, &allocation);
     }
 
@ -109,7 +118,7 @@ Index: gtk+-2.12.1/gtk/gtktreeview.c
 
   tree_view->priv->hadjustment->page_size = allocation->width;
   tree_view->priv->hadjustment->page_increment = allocation->width * 0.9;
-@@ -2331,28 +2375,30 @@
+@@ -2331,28 +2374,30 @@ gtk_tree_view_size_allocate (GtkWidget  
   tree_view->priv->hadjustment->upper = MAX (tree_view->priv->hadjustment->page_size, tree_view->priv->width);
 
   if (gtk_widget_get_direction(widget) == GTK_TEXT_DIR_RTL)   
@ -160,7 +169,7 @@ Index: gtk+-2.12.1/gtk/gtktreeview.c
 
   gtk_adjustment_changed (tree_view->priv->hadjustment);
 
-@@ -2392,8 +2438,6 @@
+@@ -2392,8 +2437,6 @@ gtk_tree_view_size_allocate (GtkWidget  
 			      allocation->height - TREE_VIEW_HEADER_HEIGHT (tree_view));
     }
 
@ -169,7 +178,7 @@ Index: gtk+-2.12.1/gtk/gtktreeview.c
   if (tree_view->priv->tree == NULL)
     invalidate_empty_focus (tree_view);
 
-@@ -2837,7 +2881,7 @@
+@@ -2837,7 +2880,7 @@ gtk_tree_view_button_press (GtkWidget   
 
 	  gtk_grab_add (widget);
 	  GTK_TREE_VIEW_SET_FLAG (tree_view, GTK_TREE_VIEW_IN_COLUMN_RESIZE);
@ -178,7 +187,7 @@ Index: gtk+-2.12.1/gtk/gtktreeview.c
 
 	  /* block attached dnd signal handler */
 	  drag_data = g_object_get_data (G_OBJECT (widget), "gtk-site-data");
-@@ -3546,6 +3590,8 @@
+@@ -3546,6 +3589,8 @@ gtk_tree_view_motion_resize_column (GtkW
     {
       column->use_resized_width = TRUE;
       column->resized_width = new_width;
@ -187,7 +196,7 @@ Index: gtk+-2.12.1/gtk/gtktreeview.c
       gtk_widget_queue_resize (widget);
     }
 
-@@ -11479,7 +11525,7 @@
+@@ -11479,7 +11524,7 @@ gtk_tree_view_move_column_after (GtkTree
   if (GTK_WIDGET_REALIZED (tree_view))
     {
       gtk_widget_queue_resize (GTK_WIDGET (tree_view));
@ -198,9 +207,9 @@ Index: gtk+-2.12.1/gtk/gtktreeview.c
   g_signal_emit (tree_view, tree_view_signals[COLUMNS_CHANGED], 0);
 Index: gtk+-2.12.1/gtk/gtktreeviewcolumn.c
 ===================================================================
--- gtk+-2.12.1.orig/gtk/gtktreeviewcolumn.c	2007-10-16 15:20:39.000000000 +0200
-+++ gtk+-2.12.1/gtk/gtktreeviewcolumn.c	2007-10-31 19:32:10.309114837 +0100
-@@ -2142,6 +2142,7 @@
+--- gtk+-2.12.1.orig/gtk/gtktreeviewcolumn.c	2007-11-01 12:04:42.319955425 +0100
+++ gtk+-2.12.1/gtk/gtktreeviewcolumn.c	2007-11-01 12:04:45.400130954 +0100
+@@ -2142,6 +2142,7 @@ gtk_tree_view_column_set_expand (GtkTree
       tree_column->tree_view != NULL &&
       GTK_WIDGET_REALIZED (tree_column->tree_view))
     {
@ -210,9 +219,9 @@ Index: gtk+-2.12.1/gtk/gtktreeviewcolumn.c
 
 Index: gtk+-2.12.1/gtk/gtktreeprivate.h
 ===================================================================
--- gtk+-2.12.1.orig/gtk/gtktreeprivate.h	2007-10-16 15:20:39.000000000 +0200
-+++ gtk+-2.12.1/gtk/gtktreeprivate.h	2007-10-31 19:32:10.309114837 +0100
-@@ -266,6 +266,10 @@
+--- gtk+-2.12.1.orig/gtk/gtktreeprivate.h	2007-11-01 12:04:42.303954513 +0100
+++ gtk+-2.12.1/gtk/gtktreeprivate.h	2007-11-01 13:41:34.211156229 +0100
+@@ -266,6 +266,10 @@ struct _GtkTreeViewPrivate
   GdkGC *tree_line_gc;
 
   gint tooltip_column;
--- a/debian/patches/040_filechooser_single-click.patch
+++ b/debian/patches/040_filechooser_single-click.patch
@ -3,8 +3,8 @@ requiring double-click.

 Index: gtk+-2.12.1/gtk/gtkfilechooserdefault.c
 ===================================================================
--- gtk+-2.12.1.orig/gtk/gtkfilechooserdefault.c	2007-10-31 19:42:02.854882096 +0100
-+++ gtk+-2.12.1/gtk/gtkfilechooserdefault.c	2007-10-31 23:05:03.757032150 +0100
+--- gtk+-2.12.1.orig/gtk/gtkfilechooserdefault.c	2007-10-16 15:20:39.000000000 +0200
+++ gtk+-2.12.1/gtk/gtkfilechooserdefault.c	2007-11-01 11:36:04.162043185 +0100
@@ -390,10 +390,6 @@
 
 static void filter_combo_changed       (GtkComboBox           *combo_box,
@ -39,6 +39,15 @@ Index: gtk+-2.12.1/gtk/gtkfilechooserdefault.c
 }
 
 static gboolean
+@@ -3930,7 +3940,7 @@
+ 		     GDK_ACTION_COPY | GDK_ACTION_MOVE);
+ 
+   selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (impl->browse_shortcuts_tree_view));
+-  gtk_tree_selection_set_mode (selection, GTK_SELECTION_BROWSE);
+  gtk_tree_selection_set_mode (selection, GTK_SELECTION_SINGLE);
+   gtk_tree_selection_set_select_function (selection,
+ 					  shortcuts_select_func,
+ 					  impl, NULL);
@@ -3938,9 +3948,6 @@
   g_signal_connect (selection, "changed",
 		    G_CALLBACK (shortcuts_selection_changed_cb), impl);
--- a/debian/patches/042_treeview_single-focus.patch
+++ b/debian/patches/042_treeview_single-focus.patch
@ -0,0 +1,14 @@
+Index: gtk+-2.12.1/gtk/gtktreeview.c
+===================================================================
+--- gtk+-2.12.1.orig/gtk/gtktreeview.c	2007-11-01 13:42:24.766037188 +0100
+++ gtk+-2.12.1/gtk/gtktreeview.c	2007-11-01 13:45:13.083629061 +0100
+@@ -9660,7 +9660,8 @@ gtk_tree_view_focus_to_cursor (GtkTreeVi
+ 
+       if (cursor_path)
+ 	{
+-	  if (tree_view->priv->selection->type == GTK_SELECTION_MULTIPLE)
+	  if (tree_view->priv->selection->type == GTK_SELECTION_MULTIPLE ||
+	      tree_view->priv->selection->type == GTK_SELECTION_SINGLE)
+ 	    gtk_tree_view_real_set_cursor (tree_view, cursor_path, FALSE, FALSE);
+ 	  else
+ 	    gtk_tree_view_real_set_cursor (tree_view, cursor_path, TRUE, FALSE);
--- a/debian/patches/series
+++ b/debian/patches/series
@ -15,6 +15,7 @@
 034_gtkcupsutils_type_fix.patch
 040_filechooser_single-click.patch
 041_ia32-libs.patch
+042_treeview_single-focus.patch
 060_ignore-random-icons.patch
 070_mandatory-relibtoolize.patch
 071_fix_gdk_window_null_crasher.patch