Mercurial > dwindows

changeset 145:659c1a2bccad

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed the calculations in the splitbar widget. Finished all the splitbar functions.
author bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date Tue, 22 Oct 2002 12:21:37 +0000
parents c68bc269ed58
children add6b46310c2
files gtk/dw.c
diffstat 1 files changed, 21 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/gtk/dw.c	Tue Oct 22 11:07:42 2002 +0000
+++ b/gtk/dw.c	Tue Oct 22 12:21:37 2002 +0000
@@ -6096,19 +6096,20 @@
 		gtk_paned_set_position(GTK_PANED(widget), (int)(event->width * (*percent / 100.0)));
 	if(GTK_IS_VPANED(widget))
 		gtk_paned_set_position(GTK_PANED(widget), (int)(event->height * (*percent / 100.0)));
+	gtk_object_set_data(GTK_OBJECT(widget), "_dw_waiting", NULL);
 	return FALSE;
 }
 
 #if GTK_MAJOR_VERSION > 1
 /* Figure out the new percentage */
-gint _splitbar_accept_position(GtkWidget *widget, gpointer data)
-{
+void _splitbar_accept_position(GObject *object, GParamSpec *pspec, gpointer data)
+{
+	GtkWidget *widget = (GtkWidget *)data;
 	float *percent = (float *)gtk_object_get_data(GTK_OBJECT(widget), "_dw_percent");
 	int size = 0, position = gtk_paned_get_position(GTK_PANED(widget));
 
-  printf("Accept position\n");
-	if(!percent)
-		return FALSE;
+	if(!percent || gtk_object_get_data(GTK_OBJECT(widget), "_dw_waiting"))
+		return;
 
 	if(GTK_IS_VPANED(widget))
 		size = widget->allocation.height;
@@ -6117,7 +6118,6 @@
 
 	if(size > 0)
 		*percent = ((float)(position * 100) / (float)size);
-	return FALSE;
 }
 #endif
 
@@ -6146,9 +6146,10 @@
 	gtk_object_set_data(GTK_OBJECT(tmp), "id", (gpointer)id);
 	*percent = 50.0;
 	gtk_object_set_data(GTK_OBJECT(tmp), "_dw_percent", (gpointer)percent);
+	gtk_object_set_data(GTK_OBJECT(tmp), "_dw_waiting", (gpointer)1);
 	gtk_signal_connect(GTK_OBJECT(tmp), "size-allocate", GTK_SIGNAL_FUNC(_splitbar_size_allocate), NULL);
 #if GTK_MAJOR_VERSION > 1
-	g_signal_connect(G_OBJECT(tmp), "accept-position", (GCallback)_splitbar_accept_position, NULL);
+	g_signal_connect(G_OBJECT(tmp), "notify::position", (GCallback)_splitbar_accept_position, (gpointer)tmp);
 #else
 	gtk_paned_set_handle_size(GTK_PANED(tmp), 3);
 #endif
@@ -6164,11 +6165,23 @@
  */
 void dw_splitbar_set(HWND handle, float percent)
 {
-	/* We probably need to force a redraw here */
 	float *mypercent = (float *)dw_window_get_data(handle, "_dw_percent");
+	int size = 0, position;
+
+	if(GTK_IS_VPANED(handle))
+		size = handle->allocation.height;
+	else if(GTK_IS_HPANED(handle))
+		size = handle->allocation.width;
 
 	if(mypercent)
 		*mypercent = percent;
+
+	if(size > 10)
+	{        
+		position = (int)((float)size * (percent / 100.0));
+
+		gtk_paned_set_position(GTK_PANED(handle), position);
+	}
 }
 
 /*