simpler system for positioning new columns

jcupitt · jcupitt · commit e3ad444bf51f · 2016-06-22T07:20:38.000+01:00
diff --git a/ChangeLog b/ChangeLog
@@ -3,6 +3,7 @@ started 8.3.1 on 19/5/16
 - configure changes to help win64
 - fix middle-drag in ws and image view
 - be more careful about the name of the image file we remove on close
+- simpler system for positioning new columns
 
 started 8.3.0 on 28/3/16
 - move path search stuff into _convert from _magick
diff --git a/TODO b/TODO
@@ -1,3 +1,10 @@
+- ^N in ws should always put the new column just to the left of the leftmost
+  complete column in the viewport
+
+  or just to the right of the current column?
+
+  current behaviour is to insert alphabetically and scroll, which is awful
+
 - sharpen should use new interface?
 
 - can we call affine from nip2 vips_call? do we need a double array?
diff --git a/src/column.c b/src/column.c
@@ -336,39 +336,10 @@ column_get_type( void )
 	return( column_type );
 }
 
-static gint
-iobject_name_compare( iObject *a, iObject *b )
-{
-        return( strcasecmp( a->name, b->name ) );
-}
-
-/* Search for the column before this name in alphabetical order.
- */
-static Column *
-column_find_previous( Column *col )
-{
-	Workspace *ws = col->ws;
-
-	GSList *columns;
-	Column *previous_col;
-	int i;
-
-	columns = icontainer_get_children( ICONTAINER( ws ) );
-	columns = g_slist_sort( columns, (GCompareFunc) iobject_name_compare );
-	i = g_slist_index( columns, col );
-	previous_col = NULL; 
-	if( i > 0 )
-		previous_col = COLUMN( g_slist_nth_data( columns, i - 1 ) );  
-	g_slist_free( columns ); 
-
-	return( previous_col );
-}
-
 Column *
 column_new( Workspace *ws, const char *name )
 {
 	Column *col;
-	Column *previous_col;
 
 	if( workspace_column_find( ws, name ) ) {
 		error_top( _( "Name clash." ) );
@@ -383,14 +354,8 @@ column_new( Workspace *ws, const char *name )
 
         subcolumn_new( NULL, col );
 
-	if( (previous_col = column_find_previous( col )) ) {
-		col->x = previous_col->x + 50;
-		col->y = previous_col->y;
-	}
-	else {
-		col->x = ws->vp.left;
-		col->y = ws->vp.top;
-	}
+	col->x = ws->vp.left + 50;
+	col->y = ws->vp.top;
 
 	column_set_last_new( col );
 
