GtkRequisition *requisition);
static void gtk_vpaned_size_allocate (GtkWidget *widget,
GtkAllocation *allocation);
-static void gtk_vpaned_xor_line (GtkPaned *paned);
-static gboolean gtk_vpaned_button_press (GtkWidget *widget,
- GdkEventButton *event);
-static gboolean gtk_vpaned_button_release (GtkWidget *widget,
- GdkEventButton *event);
-static gboolean gtk_vpaned_motion (GtkWidget *widget,
- GdkEventMotion *event);
static gpointer parent_class;
-GtkType
+GType
gtk_vpaned_get_type (void)
{
- static GtkType vpaned_type = 0;
+ static GType vpaned_type = 0;
if (!vpaned_type)
{
- static const GtkTypeInfo vpaned_info =
+ static const GTypeInfo vpaned_info =
{
- "GtkVPaned",
- sizeof (GtkVPaned),
sizeof (GtkVPanedClass),
- (GtkClassInitFunc) gtk_vpaned_class_init,
- (GtkObjectInitFunc) gtk_vpaned_init,
- /* reserved_1 */ NULL,
- /* reserved_2 */ NULL,
- (GtkClassInitFunc) NULL,
+ NULL, /* base_init */
+ NULL, /* base_finalize */
+ (GClassInitFunc) gtk_vpaned_class_init,
+ NULL, /* class_finalize */
+ NULL, /* class_data */
+ sizeof (GtkVPaned),
+ 0, /* n_preallocs */
+ (GInstanceInitFunc) gtk_vpaned_init,
};
- vpaned_type = gtk_type_unique (GTK_TYPE_PANED, &vpaned_info);
+ vpaned_type = g_type_register_static (GTK_TYPE_PANED, "GtkVPaned",
+ &vpaned_info, 0);
}
return vpaned_type;
{
GtkWidgetClass *widget_class;
- parent_class = gtk_type_class (GTK_TYPE_PANED);
+ parent_class = g_type_class_peek_parent (class);
widget_class = (GtkWidgetClass *) class;
widget_class->size_request = gtk_vpaned_size_request;
widget_class->size_allocate = gtk_vpaned_size_allocate;
- widget_class->button_press_event = gtk_vpaned_button_press;
- widget_class->button_release_event = gtk_vpaned_button_release;
- widget_class->motion_notify_event = gtk_vpaned_motion;
}
static void
{
GtkVPaned *vpaned;
- vpaned = gtk_type_new (GTK_TYPE_VPANED);
+ vpaned = g_object_new (GTK_TYPE_VPANED, NULL);
return GTK_WIDGET (vpaned);
}
paned->handle_pos.width = MAX (1, (gint) widget->allocation.width - 2 * border_width);
paned->handle_pos.height = handle_size;
- if (GTK_WIDGET_REALIZED(widget))
+ if (GTK_WIDGET_REALIZED (widget))
{
- gdk_window_show (paned->handle);
+ if (GTK_WIDGET_MAPPED (widget))
+ gdk_window_show (paned->handle);
gdk_window_move_resize (paned->handle,
paned->handle_pos.x,
paned->handle_pos.y,
}
child1_allocation.width = child2_allocation.width = MAX (1, (gint) allocation->width - border_width * 2);
- child1_allocation.height = paned->child1_size;
+ child1_allocation.height = MAX (1, paned->child1_size);
child1_allocation.x = child2_allocation.x = widget->allocation.x + border_width;
- child1_allocation.y = border_width;
+ child1_allocation.y = widget->allocation.y + border_width;
- child2_allocation.y = child1_allocation.y + child1_allocation.height + paned->handle_pos.height;
- child2_allocation.height = MAX(1, (gint) allocation->height - child2_allocation.y - border_width);
+ child2_allocation.y = child1_allocation.y + paned->child1_size + paned->handle_pos.height;
+ child2_allocation.height = MAX (1, widget->allocation.y + widget->allocation.height - child2_allocation.y - border_width);
/* Now allocate the childen, making sure, when resizing not to
- * overlap the windows */
+ * overlap the windows
+ */
if (GTK_WIDGET_MAPPED (widget) &&
paned->child1->allocation.height < child1_allocation.height)
{
- gtk_widget_size_allocate(paned->child2, &child2_allocation);
- gtk_widget_size_allocate(paned->child1, &child1_allocation);
+ gtk_widget_size_allocate (paned->child2, &child2_allocation);
+ gtk_widget_size_allocate (paned->child1, &child1_allocation);
}
else
{
- gtk_widget_size_allocate(paned->child1, &child1_allocation);
- gtk_widget_size_allocate(paned->child2, &child2_allocation);
+ gtk_widget_size_allocate (paned->child1, &child1_allocation);
+ gtk_widget_size_allocate (paned->child2, &child2_allocation);
}
}
else
if (GTK_WIDGET_REALIZED (widget))
gdk_window_hide (paned->handle);
-
- child_allocation.x = border_width;
- child_allocation.y = border_width;
+
+ if (paned->child1)
+ gtk_widget_set_child_visible (paned->child1, TRUE);
+ if (paned->child2)
+ gtk_widget_set_child_visible (paned->child2, TRUE);
+
+ child_allocation.x = widget->allocation.x + border_width;
+ child_allocation.y = widget->allocation.y + border_width;
child_allocation.width = MAX (1, allocation->width - 2 * border_width);
child_allocation.height = MAX (1, allocation->height - 2 * border_width);
gtk_widget_size_allocate (paned->child2, &child_allocation);
}
}
-
-static void
-gtk_vpaned_xor_line (GtkPaned *paned)
-{
- GtkWidget *widget;
- GdkGCValues values;
- guint16 ypos;
- gint handle_size;
-
- widget = GTK_WIDGET (paned);
-
- gtk_widget_style_get (widget, "handle_size", &handle_size, NULL);
-
- 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);
- }
-
- gdk_gc_set_line_attributes (paned->xor_gc, 2, GDK_LINE_SOLID,
- GDK_CAP_NOT_LAST, GDK_JOIN_BEVEL);
-
- ypos = widget->allocation.y + paned->child1_size
- + GTK_CONTAINER (paned)->border_width + handle_size / 2;
-
- gdk_draw_line (widget->window, paned->xor_gc,
- widget->allocation.x,
- ypos,
- widget->allocation.x + widget->allocation.width - 1,
- ypos);
-}
-
-static gboolean
-gtk_vpaned_button_press (GtkWidget *widget,
- GdkEventButton *event)
-{
- GtkPaned *paned = GTK_PANED (widget);
- gint handle_size;
-
- gtk_widget_style_get (widget, "handle_size", &handle_size, NULL);
-
- if (!paned->in_drag &&
- (event->window == paned->handle) && (event->button == 1))
- {
- paned->in_drag = TRUE;
- /* We need a server grab here, not gtk_grab_add(), since
- * we don't want to pass events on to the widget's children */
- gdk_pointer_grab (paned->handle, FALSE,
- GDK_POINTER_MOTION_HINT_MASK
- | GDK_BUTTON1_MOTION_MASK
- | GDK_BUTTON_RELEASE_MASK, NULL, NULL,
- event->time);
- paned->child1_size += event->y - handle_size / 2;
- paned->child1_size = CLAMP (paned->child1_size, 0,
- widget->allocation.height -
- handle_size -
- 2 * GTK_CONTAINER (paned)->border_width);
- gtk_vpaned_xor_line(paned);
-
- return TRUE;
- }
-
- return FALSE;
-}
-
-static gboolean
-gtk_vpaned_button_release (GtkWidget *widget,
- GdkEventButton *event)
-{
- GtkPaned *paned = GTK_PANED (widget);
- GObject *object = G_OBJECT (widget);
-
- if (paned->in_drag && (event->button == 1))
- {
- gtk_vpaned_xor_line (paned);
- paned->in_drag = FALSE;
- paned->position_set = TRUE;
- gdk_pointer_ungrab (event->time);
- gtk_widget_queue_resize (GTK_WIDGET (paned));
- g_object_freeze_notify (object);
- g_object_notify (object, "position");
- g_object_notify (object, "position_set");
- g_object_thaw_notify (object);
-
- return TRUE;
- }
-
- return FALSE;
-}
-
-static gboolean
-gtk_vpaned_motion (GtkWidget *widget,
- GdkEventMotion *event)
-{
- GtkPaned *paned = GTK_PANED (widget);
- gint y;
- gint handle_size;
-
- gtk_widget_style_get (widget, "handle_size", &handle_size, NULL);
-
- gtk_widget_get_pointer (widget, NULL, &y);
-
- if (paned->in_drag)
- {
- gint size = y - GTK_CONTAINER (paned)->border_width - handle_size / 2;
-
- gtk_vpaned_xor_line (paned);
- paned->child1_size = CLAMP (size, paned->min_position, paned->max_position);
- gtk_vpaned_xor_line (paned);
- }
-
- return TRUE;
-}
projects / ~andy / gtk / blobdiff