GNOME.org
 

nautilus r14541 - in trunk: . libnautilus-private

Author: cneumair
Date: Sat Aug 30 16:51:51 2008
New Revision: 14541
URL: http://svn.gnome.org/viewvc/nautilus?rev=14541&view=rev

Log:
2008-08-30  Christian Neumair  <cneumair gnome org>

	* libnautilus-private/nautilus-icon-container.c (get_cmp_point_x),
	(compare_with_start_row), (compare_with_start_column),
	(next_row_rightmost), (next_column_bottommost),
	(same_column_below_highest), (keyboard_home), (keyboard_end),
	(record_arrow_key_start), (keyboard_arrow_key), (keyboard_right),
	(keyboard_left), (keyboard_down), (keyboard_up),
	(button_press_event):
	Split out fallback function that determine the rightmost icon on the
	bottom row, which used to be inside same_column_below_highest().
	Add a similar concept for the vertical layout.

	Vertical layout: Move to the last item when pressing the right arrow
			 key in the penultimate column, below the last item.
				next_row_rightmost().

	Horizontal layout: Move to the last item when pressing the down arrow
			   key in the penultimate row, right to the last item.
				next_column_bottommost().

	Remove arrow_key_start, and use arrow_key_axis_x/_y, for
	horizontal/vertical position constraints in
	compare_with_start_column() and compare_with_start_row().

	Fixes #549686, at least for LTR.

	* libnautilus-private/nautilus-icon-private.h:
	Remove unused arrow_key_axis and arrow_key_start variables.


Modified:
   trunk/ChangeLog
   trunk/libnautilus-private/nautilus-icon-container.c
   trunk/libnautilus-private/nautilus-icon-private.h

Modified: trunk/libnautilus-private/nautilus-icon-container.c
==============================================================================
--- trunk/libnautilus-private/nautilus-icon-container.c	(original)
+++ trunk/libnautilus-private/nautilus-icon-container.c	Sat Aug 30 16:51:51 2008
@@ -299,6 +299,7 @@
 	return icon->x != ICON_UNPOSITIONED_VALUE && icon->y != ICON_UNPOSITIONED_VALUE;
 }
 
+
 /* x, y are the top-left coordinates of the icon. */
 static void
 icon_set_position (NautilusIcon *icon,
@@ -2724,8 +2725,7 @@
 		 EelDRect icon_rect)
 {
 	if (container->details->label_position == NAUTILUS_ICON_LABEL_POSITION_BESIDE) {
-		if (gtk_widget_get_direction (GTK_WIDGET (container)) == GTK_TEXT_DIR_RTL ||
-		    nautilus_icon_container_is_layout_vertical (container)) {
+		if (gtk_widget_get_direction (GTK_WIDGET (container)) == GTK_TEXT_DIR_RTL) {
 			return icon_rect.x0;
 		} else {
 			return icon_rect.x1;
@@ -2785,45 +2785,6 @@
 }
 
 static int
-compare_icons_vertical_first_reverse_horizontal (NautilusIconContainer *container,
-						 NautilusIcon *icon_a,
-						 NautilusIcon *icon_b)
-{
-	EelDRect world_rect;
-	int ax, ay, bx, by;
-
-	world_rect = nautilus_icon_canvas_item_get_icon_rectangle (icon_a->item);
-	eel_canvas_w2c
-		(EEL_CANVAS (container),
-		 get_cmp_point_x (container, world_rect),
-		 get_cmp_point_y (container, world_rect),
-		 &ax,
-		 &ay);
-	world_rect = nautilus_icon_canvas_item_get_icon_rectangle (icon_b->item);
-	eel_canvas_w2c
-		(EEL_CANVAS (container),
-		 get_cmp_point_x (container, world_rect),
-		 get_cmp_point_y (container, world_rect),
-		 &bx,
-		 &by);
-	
-	if (ay < by) {
-		return -1;
-	}
-	if (ay > by) {
-		return +1;
-	}
-	if (ax < bx) {
-		return (nautilus_icon_container_is_layout_rtl (container) ? -1 : +1);
-	}
-	if (ax > bx) {
-		return (nautilus_icon_container_is_layout_rtl (container) ? +1 : -1);
-	}
-	return compare_icons_by_uri (container, icon_a, icon_b);
-}
-
-
-static int
 compare_icons_vertical_first (NautilusIconContainer *container,
 			      NautilusIcon *icon_a,
 			      NautilusIcon *icon_b)
@@ -2895,10 +2856,10 @@
 
 	item = EEL_CANVAS_ITEM (icon->item);
 	
-	if (container->details->arrow_key_start < item->y1) {
+	if (container->details->arrow_key_start_y < item->y1) {
 		return -1;
 	}
-	if (container->details->arrow_key_start > item->y2) {
+	if (container->details->arrow_key_start_y > item->y2) {
 		return +1;
 	}
 	return 0;
@@ -2912,10 +2873,10 @@
 
 	item = EEL_CANVAS_ITEM (icon->item);
 	
-	if (container->details->arrow_key_start < item->x1) {
+	if (container->details->arrow_key_start_x < item->x1) {
 		return -1;
 	}
-	if (container->details->arrow_key_start > item->x2) {
+	if (container->details->arrow_key_start_x > item->x2) {
 		return +1;
 	}
 	return 0;
@@ -3014,6 +2975,66 @@
 }
 
 static gboolean
+next_row_rightmost (NautilusIconContainer *container,
+		    NautilusIcon *start_icon,
+		    NautilusIcon *best_so_far,
+		    NautilusIcon *candidate,
+		    void *data)
+{
+	/* sort out icons that are not below the current row */
+	if (compare_with_start_row (container, candidate) >= 0) {
+		return FALSE;
+	}
+
+	if (best_so_far != NULL) {
+		if (compare_icons_vertical_first (container,
+						  best_so_far,
+						  candidate) > 0) {
+			/* candidate is above best choice, but below the current row */
+			return TRUE;
+		}
+
+		if (compare_icons_horizontal_first (container,
+						    best_so_far,
+						    candidate) < 0) {
+			return TRUE;
+		}
+	}
+
+	return best_so_far == NULL;
+}
+
+static gboolean
+next_column_bottommost (NautilusIconContainer *container,
+			NautilusIcon *start_icon,
+			NautilusIcon *best_so_far,
+			NautilusIcon *candidate,
+			void *data)
+{
+	/* sort out icons that are not on the right of the current column */
+	if (compare_with_start_column (container, candidate) >= 0) {
+		return FALSE;
+	}
+
+	if (best_so_far != NULL) {
+		if (compare_icons_horizontal_first (container,
+						  best_so_far,
+						  candidate) > 0) {
+			/* candidate is above best choice, but below the current row */
+			return TRUE;
+		}
+
+		if (compare_icons_vertical_first (container,
+						  best_so_far,
+						  candidate) < 0) {
+			return TRUE;
+		}
+	}
+
+	return best_so_far == NULL;
+}
+
+static gboolean
 previous_row_rightmost (NautilusIconContainer *container,
 		        NautilusIcon *start_icon,
 			NautilusIcon *best_so_far,
@@ -3081,33 +3102,27 @@
 			   NautilusIcon *candidate,
 			   void *data)
 {
-	EelCanvasItem *item;
-
-	item = EEL_CANVAS_ITEM (candidate->item);
-
-	/* Candidates above or on the start row do not qualify. */
-	if (container->details->arrow_key_start_y >= item->y1) {
-		return FALSE;
-	}
-
-	/* In vertical layout, candidates on the left do not qualify. */
-	if (nautilus_icon_container_is_layout_vertical (container) &&
-	    container->details->arrow_key_start_x > item->x1) {
+	/* Candidates not on the start column do not qualify. */
+	if (compare_with_start_column (container, candidate) != 0) {
 		return FALSE;
 	}
 
+	/* Candidates that are lower lose out. */
 	if (best_so_far != NULL) {
-		/* Candidates on the start column are preferred. */
-		if (compare_with_start_column (container, candidate) != 0 &&
-		    compare_with_start_column (container, best_so_far) == 0) {
-			return FALSE;
-		}
-		/* Candidates that are lower or to the left lose out. */
-		if (compare_icons_vertical_first_reverse_horizontal (container, best_so_far, candidate) <= 0) {
+		if (compare_icons_vertical_first (container,
+						  best_so_far,
+						  candidate) < 0) {
 			return FALSE;
 		}
 	}
 
+	/* Candidates above the start do not qualify. */
+	if (compare_icons_vertical_first (container,
+					  candidate,
+					  start_icon) <= 0) {
+		return FALSE;
+	}
+
 	return TRUE;
 }
 
@@ -3358,7 +3373,6 @@
 					NULL);
 	to = find_best_icon (container, NULL, leftmost_in_top_row, NULL);	
 
-	container->details->arrow_key_axis = AXIS_NONE;
 	keyboard_move_to (container, to, from, event);
 }
 
@@ -3381,7 +3395,6 @@
 			     rightmost_in_bottom_row,
 			     NULL);
 
-	container->details->arrow_key_axis = AXIS_NONE;
 	keyboard_move_to (container, to, from, event);
 }
 
@@ -3399,23 +3412,7 @@
 		 get_cmp_point_y (container, world_rect),
 		 &container->details->arrow_key_start_x,
 		 &container->details->arrow_key_start_y);
-	
 	container->details->arrow_key_direction = direction;
-	
-	switch (container->details->arrow_key_direction) {
-	case GTK_DIR_UP:
-	case GTK_DIR_DOWN:
-		container->details->arrow_key_axis = AXIS_VERTICAL;
-		container->details->arrow_key_start = container->details->arrow_key_start_x;
-		break;
-	case GTK_DIR_LEFT:
-	case GTK_DIR_RIGHT:
-		container->details->arrow_key_axis = AXIS_HORIZONTAL;
-		container->details->arrow_key_start = container->details->arrow_key_start_y;
-		break;
-	default:
-		g_assert_not_reached();
-	}
 }
 
 static void
@@ -3426,6 +3423,7 @@
 		    IsBetterIconFunction empty_start,
 		    IsBetterIconFunction better_destination,
 		    IsBetterIconFunction better_destination_fallback_if_no_a11y,
+		    IsBetterIconFunction better_destination_fallback_fallback,
 		    IsBetterIconFunction better_destination_manual)
 {
 	NautilusIcon *from;
@@ -3460,11 +3458,9 @@
 	 * If there is an icon, select the next icon based on the arrow direction.
 	 */
 	if (from == NULL) {
-		container->details->arrow_key_axis = AXIS_NONE;
 		to = from = find_best_icon
 			(container, NULL,
 			 empty_start, NULL);
-		
 	} else {
 		record_arrow_key_start (container, from, direction);
 		
@@ -3484,7 +3480,33 @@
 				 better_destination_fallback_if_no_a11y,
 				 &data);
 		}
-		
+
+		/* With a layout like
+		 * 1 2 3
+		 * 4
+		 * (horizontal layout)
+		 *
+		 * or
+		 *
+		 * 1 4
+		 * 2
+		 * 3 
+		 * (vertical layout)
+		 *
+		 * * pressing down for any of 1,2,3 (horizontal layout)
+		 * * pressing right for any of 1,2,3 (vertical layout)
+		 *
+		 * Should select 4.
+		 */
+		if (to == NULL &&
+		    container->details->auto_layout &&
+		    better_destination_fallback_fallback != NULL) {
+			to = find_best_icon
+				(container, from,
+				 better_destination_fallback_fallback,
+				 &data);
+		}
+
 		if (to == NULL) { 
 			to = from;
 		}
@@ -3506,6 +3528,7 @@
 		GdkEventKey *event)
 {
 	IsBetterIconFunction no_a11y;
+	IsBetterIconFunction next_column_fallback;
 
 	no_a11y = NULL;
 	if (container->details->auto_layout &&
@@ -3514,6 +3537,11 @@
 		no_a11y = next_row_leftmost;
 	}
 
+	next_column_fallback = NULL;
+	if (nautilus_icon_container_is_layout_vertical (container)) {
+		next_column_fallback = next_column_bottommost;
+	}
+
 	/* Right selects the next icon in the same row.
 	 * Control-Right sets the keyboard focus to the next icon in the same row.
 	 */
@@ -3524,6 +3552,7 @@
 			    leftmost_in_top_row,
 			    same_row_right_side_leftmost,
 			    no_a11y,
+			    next_column_fallback,
 			    closest_in_90_degrees);
 }
 
@@ -3550,6 +3579,7 @@
 			    rightmost_in_bottom_row,
 			    same_row_left_side_rightmost,
 			    no_a11y,
+			    NULL, /* TODO RTL */
 			    closest_in_90_degrees);
 }
 
@@ -3558,6 +3588,7 @@
 	       GdkEventKey *event)
 {
 	IsBetterIconFunction no_a11y;
+	IsBetterIconFunction next_row_fallback;
 
 	no_a11y = NULL;
 	if (container->details->auto_layout &&
@@ -3566,6 +3597,11 @@
 		no_a11y = next_column_highest;
 	}
 
+	next_row_fallback = NULL;
+	if (!nautilus_icon_container_is_layout_vertical (container)) {
+		next_row_fallback = next_row_rightmost;
+	}
+
 	/* Down selects the next icon in the same column.
 	 * Control-Down sets the keyboard focus to the next icon in the same column.
 	 */
@@ -3576,6 +3612,7 @@
 			    leftmost_in_top_row,
 			    same_column_below_highest,
 			    no_a11y,
+			    next_row_fallback, /* TODO RTL */
 			    closest_in_90_degrees);
 }
 
@@ -3602,6 +3639,7 @@
 			    rightmost_in_bottom_row,
 			    same_column_above_lowest,
 			    no_a11y,
+			    NULL,
 			    closest_in_90_degrees);
 }
 
@@ -3920,9 +3958,6 @@
         clear_keyboard_focus (container);
 	clear_keyboard_rubberband_start (container);
 
-	/* Forget about where we began with the arrow keys now that we're mousing. */
-	container->details->arrow_key_axis = AXIS_NONE;
-
 	if (event->type == GDK_2BUTTON_PRESS || event->type == GDK_3BUTTON_PRESS) {
 		/* We use our own double-click detection. */
 		return TRUE;

Modified: trunk/libnautilus-private/nautilus-icon-private.h
==============================================================================
--- trunk/libnautilus-private/nautilus-icon-private.h	(original)
+++ trunk/libnautilus-private/nautilus-icon-private.h	Sat Aug 30 16:51:51 2008
@@ -214,10 +214,7 @@
 	GdkColor label_colors [LAST_LABEL_COLOR];
 	
 	/* State used so arrow keys don't wander if icons aren't lined up.
-	 * Keeps track of last axis arrow key was used on.
 	 */
-	Axis arrow_key_axis;
-	int arrow_key_start;
 	int arrow_key_start_x;
 	int arrow_key_start_y;
 	GtkDirectionType arrow_key_direction;
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]