1 files changed, 57 insertions, 320 deletions

diff --git a/libnautilus-private/nautilus-horizontal-splitter.c b/libnautilus-private/nautilus-horizontal-splitter.c
index 3a5c5a674..1f18dadc8 100644
--- a/libnautilus-private/nautilus-horizontal-splitter.c
+++ b/libnautilus-private/nautilus-horizontal-splitter.c
@@ -26,13 +26,12 @@
 #include "nautilus-horizontal-splitter.h"
 
 #include <eel/eel-gtk-macros.h>
-
 #include <stdlib.h>
 
 struct NautilusHorizontalSplitterDetails {
-	gboolean down;
-	double down_position;
-	guint32 down_time;
+	double press_x;
+	guint32 press_time;
+	int press_position;
 	int saved_size;
 };
 
@@ -43,62 +42,21 @@ struct NautilusHorizontalSplitterDetails {
 #define SPLITTER_CLICK_SLOP 1
 #define SPLITTER_CLICK_TIMEOUT	400
 
-/* NautilusHorizontalSplitterClass methods */
-static void     nautilus_horizontal_splitter_class_init (NautilusHorizontalSplitterClass *horizontal_splitter_class);
-static void     nautilus_horizontal_splitter_init       (NautilusHorizontalSplitter      *horizontal_splitter);
-static gboolean nautilus_horizontal_splitter_button_press     (GtkWidget                       *widget,
-							       GdkEventButton                  *event);
-static gboolean nautilus_horizontal_splitter_button_release   (GtkWidget                       *widget,
-							       GdkEventButton                  *event);
-static gboolean nautilus_horizontal_splitter_motion           (GtkWidget      		       *widget,
-							       GdkEventMotion 		       *event);
-
-/* GtkObjectClass methods */
-static void     nautilus_horizontal_splitter_destroy          (GtkObject                       *object);
-
-/* GtkWidgetClass methods */
-#if GNOME2_CONVERSION_COMPLETE
-static void     nautilus_horizontal_splitter_draw             (GtkWidget                       *widget,
-							       GdkRectangle                    *area);
-#endif
+static void nautilus_horizontal_splitter_class_init (NautilusHorizontalSplitterClass *horizontal_splitter_class);
+static void nautilus_horizontal_splitter_init       (NautilusHorizontalSplitter      *horizontal_splitter);
 
 EEL_CLASS_BOILERPLATE (NautilusHorizontalSplitter,
-				   nautilus_horizontal_splitter,
-				   E_TYPE_HPANED)
-
-/* GtkObjectClass methods */
-static void
-nautilus_horizontal_splitter_class_init (NautilusHorizontalSplitterClass *horizontal_splitter_class)
-{
-	GtkObjectClass *object_class;
-	GtkWidgetClass *widget_class;
-	
-	object_class = GTK_OBJECT_CLASS (horizontal_splitter_class);
-	widget_class = GTK_WIDGET_CLASS (horizontal_splitter_class);
-
-	/* GtkObjectClass */
-	object_class->destroy = nautilus_horizontal_splitter_destroy;
-
-	/* GtkWidgetClass */
-#if GNOME2_CONVERSION_COMPLETE
-	widget_class->draw = nautilus_horizontal_splitter_draw;
-#endif
-	widget_class->button_press_event = nautilus_horizontal_splitter_button_press;
-	widget_class->button_release_event = nautilus_horizontal_splitter_button_release;
-	widget_class->motion_notify_event = nautilus_horizontal_splitter_motion;
-	
-}
+		       nautilus_horizontal_splitter,
+		       GTK_TYPE_HPANED)
 
 static void
 nautilus_horizontal_splitter_init (NautilusHorizontalSplitter *horizontal_splitter)
 {
 	horizontal_splitter->details = g_new0 (NautilusHorizontalSplitterDetails, 1);
-	e_paned_set_handle_size (E_PANED (horizontal_splitter), BAR_WIDTH);
 }
 
-/* GtkObjectClass methods */
 static void
-nautilus_horizontal_splitter_destroy (GtkObject *object)
+nautilus_horizontal_splitter_finalize (GObject *object)
 {
 	NautilusHorizontalSplitter *horizontal_splitter;
 	
@@ -106,223 +64,64 @@ nautilus_horizontal_splitter_destroy (GtkObject *object)
 
 	g_free (horizontal_splitter->details);
 	
-	/* Chain */
-	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (G_OBJECT_CLASS, finalize, (object));
 }
 
-#if GNOME2_CONVERSION_COMPLETE
-
 static void
-draw_resize_bar (GtkWidget		*widget,
-		 GdkWindow		*window,
-		 const GdkRectangle	*area)
+splitter_expand (NautilusHorizontalSplitter *splitter, int position)
 {
-	GtkStyle	*style;
-	GdkGC		*gcs[BAR_WIDTH];
-	guint		i;
-
-	g_assert (widget != NULL);
-	g_assert (window != NULL);
-	g_assert (area != NULL);
-	g_assert (area->width == BAR_WIDTH);
+	g_return_if_fail (NAUTILUS_IS_HORIZONTAL_SPLITTER (splitter));
 
-	style = widget->style;
+	if (position >= CLOSED_THRESHOLD) {
+		return;
+	}
 
-	g_assert (style != NULL);
-	
-	gcs[0] = style->fg_gc[GTK_STATE_NORMAL];
-	gcs[1] = style->fg_gc[GTK_STATE_SELECTED];
-	gcs[2] = style->light_gc[GTK_STATE_ACTIVE];
-	gcs[3] = style->bg_gc[GTK_STATE_NORMAL];
-	gcs[4] = style->mid_gc[GTK_STATE_ACTIVE];
-	gcs[5] = style->dark_gc[GTK_STATE_NORMAL];
-	gcs[6] = style->fg_gc[GTK_STATE_NORMAL];
-		
-	for (i = 0; i < BAR_WIDTH; i++)
-	{
-		gdk_draw_line (window,
-			       gcs[i],
-			       area->x + i,
-			       area->y,
-			       area->x + i,
-			       area->y + area->height - 1);
+	position = splitter->details->saved_size;
+	if (position < CLOSED_THRESHOLD) {
+		position = NOMINAL_SIZE;
 	}
+	
+	gtk_paned_set_position (GTK_PANED (splitter), position);
 }
 
-/* Number of ridges in the thumb currently hardcoded to 8 */
-#define NUM_RIDGES 8
-
-/* These control the layout of the ridges */
-#define RIDGE_HEIGHT 2
-#define RIDGE_EDGE_OFFSET 2
-#define BETWEEN_RIDGE_OFFSET 1
-
 static void
-draw_resize_bar_thumb (GtkWidget		*widget,
-		       GdkWindow		*window,
-		       const GdkRectangle	*area)
+splitter_collapse (NautilusHorizontalSplitter *splitter, int position)
 {
-	EPaned		*paned;
-	GtkStyle	*style;
-	GdkGC		*light_gc;
-	GdkGC		*dark_gc;
-	guint		total_thumb_height;
-
-	g_assert (widget != NULL);
-	g_assert (window != NULL);
-	g_assert (area != NULL);
-	g_assert (area->width == BAR_WIDTH);
-
-	style = widget->style;
-	g_assert (style != NULL);
-
-	paned = E_PANED (widget);
-
-	light_gc = style->light_gc[GTK_STATE_ACTIVE];
-	dark_gc = style->dark_gc[GTK_STATE_NORMAL];
-
-	total_thumb_height = (NUM_RIDGES * RIDGE_HEIGHT) + ((NUM_RIDGES - 1) * BETWEEN_RIDGE_OFFSET);
-
-	/* Make sure the thumb aint bigger than the handle */
-	if (total_thumb_height > paned->handle_height)
-	{
-		total_thumb_height = paned->handle_height;
-	}
+	g_return_if_fail (NAUTILUS_IS_HORIZONTAL_SPLITTER (splitter));
 
-	/* Draw the thumb only if we have enough space for at least one ridge */
-	if (total_thumb_height > RIDGE_HEIGHT)
-	{
-		gint	y = paned->handle_ypos + (paned->handle_height - total_thumb_height) / 2;
-		guint	i;
-		
-		for (i = 0; i < NUM_RIDGES; i++)
-		{
-			gint x1 = area->x + RIDGE_EDGE_OFFSET;
-			gint x2 = area->x + BAR_WIDTH - RIDGE_EDGE_OFFSET;
-
-			gdk_draw_line (window,
-				       dark_gc,
-				       x1,
-				       y,
-				       x2,
-				       y);
-			
-			y += BETWEEN_RIDGE_OFFSET;
-			
-			gdk_draw_line (window,
-				       light_gc,
-				       x1,
-				       y,
-				       x2,
-				       y);
-			
-			y += RIDGE_HEIGHT;
-		}
-	}
+	splitter->details->saved_size = position;
+	gtk_paned_set_position (GTK_PANED (splitter), 0);
 }
 
-/* GtkWidgetClass methods */
 static void
-nautilus_horizontal_splitter_draw (GtkWidget    *widget,
-				   GdkRectangle *area)
+splitter_toggle (NautilusHorizontalSplitter *splitter, int position)
 {
-	EPaned *paned;
-	GdkRectangle handle_area, child_area;
-	guint16 border_width;
-
-	g_return_if_fail (widget != NULL);
-	g_return_if_fail (E_IS_PANED (widget));
-
-	if (GTK_WIDGET_VISIBLE (widget) && GTK_WIDGET_MAPPED (widget)) {
-		paned = E_PANED (widget);
-		border_width = GTK_CONTAINER (paned)->border_width;
-
-		gdk_window_clear_area (widget->window,
-				       area->x, area->y, area->width,
-				       area->height);
-
-		if (e_paned_handle_shown(paned)) {
-			handle_area.x = paned->handle_xpos;
-			handle_area.y = paned->handle_ypos;
-			handle_area.width = paned->handle_size;
-			handle_area.height = paned->handle_height;
-	  
-			if (gdk_rectangle_intersect (&handle_area, area, &child_area)) {
-				child_area.x -= paned->handle_xpos;
-				child_area.y -= paned->handle_ypos;
-
-				/* Simply things by always drawing the full width of the bar. */
-				child_area.x = 0;
-				child_area.width = BAR_WIDTH;
-
-				draw_resize_bar (widget, paned->handle, &child_area);
-				draw_resize_bar_thumb (widget, paned->handle, &child_area);
-			}
-		}
-
-		/* Redraw the children
-		 */
-		if (paned->child1 && gtk_widget_intersect (paned->child1, area, &child_area)) {
-			gtk_widget_draw (paned->child1, &child_area);
-		}
+	g_return_if_fail (NAUTILUS_IS_HORIZONTAL_SPLITTER (splitter));
 
-		if (paned->child2 && gtk_widget_intersect (paned->child2, area, &child_area)) {
-			gtk_widget_draw (paned->child2, &child_area);
-		}
+	if (gtk_paned_get_position (GTK_PANED (splitter)) >= CLOSED_THRESHOLD) {
+		nautilus_horizontal_splitter_collapse (splitter);
+	} else {
+		nautilus_horizontal_splitter_expand (splitter);
 	}
 }
 
-#endif
-
 void
 nautilus_horizontal_splitter_expand (NautilusHorizontalSplitter *splitter)
 {
-	int position;
-
-	g_return_if_fail (NAUTILUS_IS_HORIZONTAL_SPLITTER (splitter));
-
-	position = e_paned_get_position (E_PANED (splitter));
-
-	if (position >= CLOSED_THRESHOLD) {
-		return;
-	}
-
-	position = splitter->details->saved_size;
-	if (position < CLOSED_THRESHOLD) {
-		position = NOMINAL_SIZE;
-	}
-	
-	e_paned_set_position (E_PANED (splitter), position);
+	splitter_expand (splitter, gtk_paned_get_position (GTK_PANED (splitter)));
 }
 
 void
 nautilus_horizontal_splitter_collapse (NautilusHorizontalSplitter *splitter)
 {
-	int position;
-
-	g_return_if_fail (NAUTILUS_IS_HORIZONTAL_SPLITTER (splitter));
-
-	position = e_paned_get_position (E_PANED (splitter));
-
-	if (position < CLOSED_THRESHOLD) {
-		return;
-	}
-
-	splitter->details->saved_size = position;
-	e_paned_set_position (E_PANED (splitter), 0);
+	splitter_collapse (splitter, gtk_paned_get_position (GTK_PANED (splitter)));
 }
 
 /* routine to toggle the open/closed state of the splitter */
 void
 nautilus_horizontal_splitter_toggle_position (NautilusHorizontalSplitter *splitter)
 {
-	g_return_if_fail (NAUTILUS_IS_HORIZONTAL_SPLITTER (splitter));
-
-	if (e_paned_get_position (E_PANED (splitter)) >= CLOSED_THRESHOLD) {
-		nautilus_horizontal_splitter_collapse (splitter);
-	} else {
-		nautilus_horizontal_splitter_expand (splitter);
-	}
+	splitter_toggle (splitter, gtk_paned_get_position (GTK_PANED (splitter)));
 }
 
 /* NautilusHorizontalSplitter public methods */
@@ -336,120 +135,58 @@ nautilus_horizontal_splitter_new (void)
 static gboolean
 nautilus_horizontal_splitter_button_press (GtkWidget *widget, GdkEventButton *event)
 {
+	gboolean result;
 	NautilusHorizontalSplitter *splitter;
+	int position;
 	
 	splitter = NAUTILUS_HORIZONTAL_SPLITTER (widget);
 
-	if (event->window != E_PANED (widget)->handle) {
-		splitter->details->down = FALSE;
-	} else {
-		splitter->details->down = TRUE;
-		splitter->details->down_position = event->x;
-		splitter->details->down_time = event->time;
-	}
+	position = gtk_paned_get_position (GTK_PANED (widget));
 
-	return EEL_CALL_PARENT_WITH_RETURN_VALUE
+	result = EEL_CALL_PARENT_WITH_RETURN_VALUE
 		(GTK_WIDGET_CLASS, button_press_event, (widget, event));
-}
-
 
-static void
-splitter_xor_line (EPaned *paned)
-{
-	GtkWidget *widget;
-	GdkGCValues values;
-	guint16 xpos, half_width;
-	gint8 dash_list[2];
-	
-	widget = GTK_WIDGET(paned);
- 
-	if (!paned->xor_gc) {
-		values.function = GDK_INVERT;
-		values.subwindow_mode = GDK_INCLUDE_INFERIORS;
-		paned->xor_gc = gdk_gc_new_with_values (widget->window, &values,
-							GDK_GC_FUNCTION | GDK_GC_SUBWINDOW);
+	if (result) {
+		splitter->details->press_x = event->x;
+		splitter->details->press_time = event->time;
+		splitter->details->press_position = position;
 	}
 
-	gdk_gc_set_line_attributes (paned->xor_gc, 1, GDK_LINE_ON_OFF_DASH,
-				    GDK_CAP_NOT_LAST, GDK_JOIN_BEVEL);
-	
-	/* Make line appear as every other pixel dash */			    
-	dash_list[0] = 1;				    
-	dash_list[1] = 1;
-	gdk_gc_set_dashes (paned->xor_gc, 1, dash_list, 2);
-
-	xpos = paned->child1_size + GTK_CONTAINER (paned)->border_width + paned->handle_size / 2;
-	half_width = paned->handle_size / 2;
-	
-	gdk_draw_line (widget->window, paned->xor_gc, xpos - half_width, 0, xpos - half_width,
-		       widget->allocation.height - 1);
-
-	gdk_draw_line (widget->window, paned->xor_gc, xpos + half_width, 0, xpos + half_width,
-		       widget->allocation.height - 1);
-
+	return result;
 }
 
-
 /* handle mouse ups by seeing if it was a tap and toggling the open state accordingly */
 static gboolean
 nautilus_horizontal_splitter_button_release (GtkWidget *widget, GdkEventButton *event)
 {
+	gboolean result;
 	NautilusHorizontalSplitter *splitter;
 	int delta, delta_time;
-	EPaned *paned;
-	
 	splitter = NAUTILUS_HORIZONTAL_SPLITTER (widget);
 
-	if (event->window == E_PANED (widget)->handle
-	    && splitter->details->down) {
-		delta = abs (event->x - splitter->details->down_position);
-		delta_time = abs (splitter->details->down_time - event->time);
+	result = EEL_CALL_PARENT_WITH_RETURN_VALUE
+		(GTK_WIDGET_CLASS, button_release_event, (widget, event));
+
+	if (result) {
+		delta = abs (event->x - splitter->details->press_x);
+		delta_time = event->time - splitter->details->press_time;
 		if (delta < SPLITTER_CLICK_SLOP && delta_time < SPLITTER_CLICK_TIMEOUT)  {
 			nautilus_horizontal_splitter_toggle_position (splitter);
 		}
 	}
 
-	splitter->details->down = FALSE;
-
-
-	paned = E_PANED (widget);
-
-	if (paned->in_drag && (event->button == 1)) {
-		splitter_xor_line (paned);
-		paned->in_drag = FALSE;
-		paned->position_set = TRUE;
-		gdk_pointer_ungrab (event->time);
-		gtk_widget_queue_resize (GTK_WIDGET (paned));
-      		return TRUE;
-    	}
-
-  	return FALSE;  
+	return result;
 }
 
-static gboolean
-nautilus_horizontal_splitter_motion (GtkWidget *widget, GdkEventMotion *event)
+static void
+nautilus_horizontal_splitter_class_init (NautilusHorizontalSplitterClass *class)
 {
-	EPaned *paned;
-	gint x;
-
-	g_return_val_if_fail (widget != NULL, FALSE);
-	g_return_val_if_fail (E_IS_PANED (widget), FALSE);
-
-	paned = E_PANED (widget);
-
-	if (event->is_hint || event->window != widget->window) {
-		gtk_widget_get_pointer(widget, &x, NULL);
-	} else {
-		x = event->x;
-	}
+	GtkWidgetClass *widget_class;
+	
+	widget_class = GTK_WIDGET_CLASS (class);
 
-	if (paned->in_drag) {
-		gint size = x - GTK_CONTAINER (paned)->border_width - paned->handle_size / 2;
-		splitter_xor_line (paned);
-		paned->child1_size = CLAMP (e_paned_quantized_size (paned, size), paned->min_position, paned->max_position);
-		splitter_xor_line (paned);
-	}
+	G_OBJECT_CLASS (class)->finalize = nautilus_horizontal_splitter_finalize;
 
-	return TRUE;
+	widget_class->button_press_event = nautilus_horizontal_splitter_button_press;
+	widget_class->button_release_event = nautilus_horizontal_splitter_button_release;
 }
-