* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
*
* This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
+ * modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
+ * Lesser General Public License for more details.
*
- * You should have received a copy of the GNU Library General Public
+ * You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
+
+/*
+ * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS
+ * file for a list of people on the GTK+ Team. See the ChangeLog
+ * files for a list of changes. These files are distributed with
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
+ */
+
#include "gtkhpaned.h"
-#include "gtkmain.h"
-#include "gtksignal.h"
-
-static void gtk_hpaned_class_init (GtkHPanedClass *klass);
-static void gtk_hpaned_init (GtkHPaned *hpaned);
-static void gtk_hpaned_size_request (GtkWidget *widget,
- GtkRequisition *requisition);
-static void gtk_hpaned_size_allocate (GtkWidget *widget,
- GtkAllocation *allocation);
-static void gtk_hpaned_draw (GtkWidget *widget,
- GdkRectangle *area);
-static void gtk_hpaned_xor_line (GtkPaned *paned);
-static gint gtk_hpaned_button_press (GtkWidget *widget,
- GdkEventButton *event);
-static gint gtk_hpaned_button_release (GtkWidget *widget,
- GdkEventButton *event);
-static gint gtk_hpaned_motion (GtkWidget *widget,
- GdkEventMotion *event);
-
-guint
+
+static void gtk_hpaned_class_init (GtkHPanedClass *klass);
+static void gtk_hpaned_init (GtkHPaned *hpaned);
+static void gtk_hpaned_size_request (GtkWidget *widget,
+ GtkRequisition *requisition);
+static void gtk_hpaned_size_allocate (GtkWidget *widget,
+ GtkAllocation *allocation);
+
+static gpointer parent_class;
+
+GType
gtk_hpaned_get_type (void)
{
- static guint hpaned_type = 0;
+ static GType hpaned_type = 0;
if (!hpaned_type)
{
- GtkTypeInfo hpaned_info =
+ static const GTypeInfo hpaned_info =
{
- "GtkHPaned",
- sizeof (GtkHPaned),
sizeof (GtkHPanedClass),
- (GtkClassInitFunc) gtk_hpaned_class_init,
- (GtkObjectInitFunc) gtk_hpaned_init,
- /* reversed_1 */ NULL,
- /* reversed_2 */ NULL,
- (GtkClassInitFunc) NULL,
+ NULL, /* base_init */
+ NULL, /* base_finalize */
+ (GClassInitFunc) gtk_hpaned_class_init,
+ NULL, /* class_finalize */
+ NULL, /* class_data */
+ sizeof (GtkHPaned),
+ 0, /* n_preallocs */
+ (GInstanceInitFunc) gtk_hpaned_init,
};
- hpaned_type = gtk_type_unique (gtk_paned_get_type (), &hpaned_info);
+ hpaned_type = g_type_register_static (GTK_TYPE_PANED, "GtkHPaned",
+ &hpaned_info, 0);
}
return hpaned_type;
{
GtkWidgetClass *widget_class;
- widget_class = (GtkWidgetClass*) class;
+ parent_class = g_type_class_peek_parent (class);
+
+ widget_class = (GtkWidgetClass *) class;
widget_class->size_request = gtk_hpaned_size_request;
widget_class->size_allocate = gtk_hpaned_size_allocate;
- widget_class->draw = gtk_hpaned_draw;
- widget_class->button_press_event = gtk_hpaned_button_press;
- widget_class->button_release_event = gtk_hpaned_button_release;
- widget_class->motion_notify_event = gtk_hpaned_motion;
}
static void
gtk_hpaned_init (GtkHPaned *hpaned)
{
+ GtkPaned *paned;
+
+ g_return_if_fail (GTK_IS_PANED (hpaned));
+
+ paned = GTK_PANED (hpaned);
+
+ paned->cursor_type = GDK_SB_H_DOUBLE_ARROW;
+ paned->orientation = GTK_ORIENTATION_VERTICAL;
}
-GtkWidget*
+GtkWidget *
gtk_hpaned_new (void)
{
GtkHPaned *hpaned;
- hpaned = gtk_type_new (gtk_hpaned_get_type ());
+ hpaned = g_object_new (GTK_TYPE_HPANED, NULL);
return GTK_WIDGET (hpaned);
}
gtk_hpaned_size_request (GtkWidget *widget,
GtkRequisition *requisition)
{
- GtkPaned *paned;
-
- g_return_if_fail (widget != NULL);
- g_return_if_fail (GTK_IS_HPANED (widget));
- g_return_if_fail (requisition != NULL);
+ GtkPaned *paned = GTK_PANED (widget);
+ GtkRequisition child_requisition;
- paned = GTK_PANED (widget);
requisition->width = 0;
requisition->height = 0;
if (paned->child1 && GTK_WIDGET_VISIBLE (paned->child1))
{
- gtk_widget_size_request (paned->child1, &paned->child1->requisition);
+ gtk_widget_size_request (paned->child1, &child_requisition);
- requisition->height = paned->child1->requisition.height;
- requisition->width = paned->child1->requisition.width;
+ requisition->height = child_requisition.height;
+ requisition->width = child_requisition.width;
}
if (paned->child2 && GTK_WIDGET_VISIBLE (paned->child2))
{
- gtk_widget_size_request (paned->child2, &paned->child2->requisition);
+ gtk_widget_size_request (paned->child2, &child_requisition);
- requisition->height = MAX(requisition->height,
- paned->child2->requisition.height);
- requisition->width += paned->child2->requisition.width;
+ requisition->height = MAX(requisition->height, child_requisition.height);
+ requisition->width += child_requisition.width;
}
- requisition->width += GTK_CONTAINER (paned)->border_width * 2 + paned->gutter_size;
+ requisition->width += GTK_CONTAINER (paned)->border_width * 2;
requisition->height += GTK_CONTAINER (paned)->border_width * 2;
+
+ if (paned->child1 && GTK_WIDGET_VISIBLE (paned->child1) &&
+ paned->child2 && GTK_WIDGET_VISIBLE (paned->child2))
+ {
+ gint handle_size;
+
+ gtk_widget_style_get (widget, "handle_size", &handle_size, NULL);
+ requisition->width += handle_size;
+ }
}
static void
gtk_hpaned_size_allocate (GtkWidget *widget,
GtkAllocation *allocation)
{
- GtkPaned *paned;
- GtkAllocation child1_allocation;
- GtkAllocation child2_allocation;
- guint16 border_width;
-
- g_return_if_fail (widget != NULL);
- g_return_if_fail (GTK_IS_HPANED (widget));
- g_return_if_fail (allocation != NULL);
+ GtkPaned *paned = GTK_PANED (widget);
+ gint border_width = GTK_CONTAINER (paned)->border_width;
widget->allocation = *allocation;
- paned = GTK_PANED (widget);
- border_width = GTK_CONTAINER (paned)->border_width;
-
- if (!paned->position_set)
+ if (paned->child1 && GTK_WIDGET_VISIBLE (paned->child1) &&
+ paned->child2 && GTK_WIDGET_VISIBLE (paned->child2))
{
- if (paned->child1 && GTK_WIDGET_VISIBLE (paned->child1))
- paned->child1_size = paned->child1->requisition.width;
- else
- paned->child1_size = 0;
- }
- else
- paned->child1_size = CLAMP (paned->child1_size, 0,
- allocation->width - paned->gutter_size
- - 2 * GTK_CONTAINER (paned)->border_width);
-
- /* Move the handle before the children so we don't get extra expose events */
-
- paned->handle_xpos = paned->child1_size + border_width + paned->gutter_size / 2 - paned->handle_size / 2;
- paned->handle_ypos = allocation->height - border_width - 2*paned->handle_size;
-
- if (GTK_WIDGET_REALIZED (widget))
- {
- gdk_window_move_resize (widget->window,
- allocation->x, allocation->y,
- allocation->width, allocation->height);
+ GtkAllocation child1_allocation;
+ GtkAllocation child2_allocation;
+ GtkRequisition child1_requisition;
+ GtkRequisition child2_requisition;
+ gint handle_size;
- gdk_window_move (paned->handle, paned->handle_xpos, paned->handle_ypos);
- }
+ gtk_widget_style_get (widget, "handle_size", &handle_size, NULL);
- if (GTK_WIDGET_MAPPED (widget))
- {
- gdk_window_clear_area (widget->window,
- paned->groove_rectangle.x,
- paned->groove_rectangle.y,
- paned->groove_rectangle.width,
- paned->groove_rectangle.height);
- }
-
- child1_allocation.height = child2_allocation.height = MAX (1, allocation->height - border_width * 2);
- child1_allocation.width = paned->child1_size;
- child1_allocation.x = border_width;
- child1_allocation.y = child2_allocation.y = border_width;
-
- paned->groove_rectangle.x = child1_allocation.x
- + child1_allocation.width + paned->gutter_size / 2 - 1;
- paned->groove_rectangle.y = 0;
- paned->groove_rectangle.width = 2;
- paned->groove_rectangle.height = allocation->height;
+ gtk_widget_get_child_requisition (paned->child1, &child1_requisition);
+ gtk_widget_get_child_requisition (paned->child2, &child2_requisition);
- child2_allocation.x = paned->groove_rectangle.x + paned->gutter_size / 2 + 1;
- child2_allocation.width = MAX (1, allocation->width
- - child2_allocation.x - border_width);
-
- /* Now allocate the childen, making sure, when resizing not to
- * overlap the windows */
- if (GTK_WIDGET_MAPPED(widget) &&
- paned->child1 && GTK_WIDGET_VISIBLE (paned->child1) &&
- paned->child1->allocation.width < child1_allocation.width)
- {
- if (paned->child2 && GTK_WIDGET_VISIBLE (paned->child2))
- gtk_widget_size_allocate (paned->child2, &child2_allocation);
- gtk_widget_size_allocate (paned->child1, &child1_allocation);
+ gtk_paned_compute_position (paned,
+ MAX (1, widget->allocation.width
+ - handle_size
+ - 2 * border_width),
+ child1_requisition.width,
+ child2_requisition.width);
+
+ paned->handle_pos.x = widget->allocation.x + paned->child1_size + border_width;
+ paned->handle_pos.y = widget->allocation.y + border_width;
+ paned->handle_pos.width = handle_size;
+ paned->handle_pos.height = MAX (1, widget->allocation.height - 2 * border_width);
+
+ if (GTK_WIDGET_REALIZED (widget))
+ {
+ if (GTK_WIDGET_MAPPED (widget))
+ gdk_window_show (paned->handle);
+ gdk_window_move_resize (paned->handle,
+ paned->handle_pos.x,
+ paned->handle_pos.y,
+ handle_size,
+ paned->handle_pos.height);
+ }
+
+ child1_allocation.height = child2_allocation.height = MAX (1, (gint) allocation->height - border_width * 2);
+ child1_allocation.width = MAX (1, paned->child1_size);
+ child1_allocation.x = widget->allocation.x + border_width;
+ child1_allocation.y = child2_allocation.y = widget->allocation.y + border_width;
+
+ child2_allocation.x = child1_allocation.x + paned->child1_size + paned->handle_pos.width;
+ child2_allocation.width = MAX (1, widget->allocation.x + widget->allocation.width - child2_allocation.x - border_width);
+
+ /* Now allocate the childen, making sure, when resizing not to
+ * overlap the windows
+ */
+ if (GTK_WIDGET_MAPPED (widget) &&
+ paned->child1->allocation.width < child1_allocation.width)
+ {
+ 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);
+ }
}
else
{
- if (paned->child1 && GTK_WIDGET_VISIBLE (paned->child1))
- gtk_widget_size_allocate (paned->child1, &child1_allocation);
- if (paned->child2 && GTK_WIDGET_VISIBLE (paned->child2))
- gtk_widget_size_allocate (paned->child2, &child2_allocation);
- }
-}
+ GtkAllocation child_allocation;
-static void
-gtk_hpaned_draw (GtkWidget *widget,
- GdkRectangle *area)
-{
- GtkPaned *paned;
- GdkRectangle child_area;
- guint16 border_width;
-
- g_return_if_fail (widget != NULL);
- g_return_if_fail (GTK_IS_PANED (widget));
-
- if (GTK_WIDGET_VISIBLE (widget) && GTK_WIDGET_MAPPED (widget))
- {
- paned = GTK_PANED (widget);
- border_width = GTK_CONTAINER (paned)->border_width;
-
- if (paned->child1 &&
- gtk_widget_intersect (paned->child1, area, &child_area))
- gtk_widget_draw (paned->child1, &child_area);
- if (paned->child2 &&
- gtk_widget_intersect (paned->child2, area, &child_area))
- gtk_widget_draw (paned->child2, &child_area);
-
- gdk_draw_line (widget->window,
- widget->style->dark_gc[widget->state],
- border_width + paned->child1_size + paned->gutter_size / 2 - 1,
- 0,
- border_width + paned->child1_size + paned->gutter_size / 2 - 1,
- widget->allocation.height - 1);
- gdk_draw_line (widget->window,
- widget->style->light_gc[widget->state],
- border_width + paned->child1_size + paned->gutter_size / 2,
- 0,
- border_width + paned->child1_size + paned->gutter_size / 2,
- widget->allocation.height - 1);
- }
-}
-
-static void
-gtk_hpaned_xor_line (GtkPaned *paned)
-{
- GtkWidget *widget;
- GdkGCValues values;
- guint16 xpos;
-
- widget = GTK_WIDGET(paned);
-
- if (!paned->xor_gc)
- {
- values.foreground = widget->style->white;
- values.function = GDK_XOR;
- values.subwindow_mode = GDK_INCLUDE_INFERIORS;
- paned->xor_gc = gdk_gc_new_with_values (widget->window,
- &values,
- GDK_GC_FOREGROUND |
- GDK_GC_FUNCTION |
- GDK_GC_SUBWINDOW);
- }
-
- xpos = paned->child1_size
- + GTK_CONTAINER(paned)->border_width + paned->gutter_size / 2;
-
- gdk_draw_line (widget->window, paned->xor_gc,
- xpos,
- 0,
- xpos,
- widget->allocation.height - 1);
-}
-
-static gint
-gtk_hpaned_button_press (GtkWidget *widget, GdkEventButton *event)
-{
- GtkPaned *paned;
-
- g_return_val_if_fail (widget != NULL,FALSE);
- g_return_val_if_fail (GTK_IS_PANED (widget),FALSE);
-
- paned = GTK_PANED (widget);
-
- 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->x - paned->handle_size / 2;
- paned->child1_size = CLAMP (paned->child1_size, 0,
- widget->allocation.width - paned->gutter_size
- - 2 * GTK_CONTAINER (paned)->border_width);
- gtk_hpaned_xor_line (paned);
- }
-
- return TRUE;
-}
-
-static gint
-gtk_hpaned_button_release (GtkWidget *widget, GdkEventButton *event)
-{
- GtkPaned *paned;
+ if (GTK_WIDGET_REALIZED (widget))
+ gdk_window_hide (paned->handle);
- g_return_val_if_fail (widget != NULL,FALSE);
- g_return_val_if_fail (GTK_IS_PANED (widget),FALSE);
-
- paned = GTK_PANED (widget);
-
- if (paned->in_drag && (event->button == 1))
- {
- gtk_hpaned_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;
-}
+ if (paned->child1)
+ gtk_widget_set_child_visible (paned->child1, TRUE);
+ if (paned->child2)
+ gtk_widget_set_child_visible (paned->child2, TRUE);
-static gint
-gtk_hpaned_motion (GtkWidget *widget, GdkEventMotion *event)
-{
- GtkPaned *paned;
- gint x;
-
- g_return_val_if_fail (widget != NULL, FALSE);
- g_return_val_if_fail (GTK_IS_PANED (widget), FALSE);
-
- if (event->is_hint || event->window != widget->window)
- gtk_widget_get_pointer(widget, &x, NULL);
- else
- x = event->x;
-
- paned = GTK_PANED (widget);
-
- if (paned->in_drag)
- {
- gtk_hpaned_xor_line (paned);
- paned->child1_size = x - GTK_CONTAINER (paned)->border_width - paned->gutter_size / 2;
- paned->child1_size = CLAMP (paned->child1_size, 0,
- widget->allocation.width - paned->gutter_size
- - 2 * GTK_CONTAINER (paned)->border_width);
- gtk_hpaned_xor_line (paned);
+ 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);
+
+ if (paned->child1 && GTK_WIDGET_VISIBLE (paned->child1))
+ gtk_widget_size_allocate (paned->child1, &child_allocation);
+ else if (paned->child2 && GTK_WIDGET_VISIBLE (paned->child2))
+ gtk_widget_size_allocate (paned->child2, &child_allocation);
}
-
- return TRUE;
}
projects / ~andy / gtk / blobdiff