*/
#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);
+
+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 gboolean gtk_hpaned_button_press (GtkWidget *widget,
+ GdkEventButton *event);
+static gboolean gtk_hpaned_button_release (GtkWidget *widget,
+ GdkEventButton *event);
+static gboolean gtk_hpaned_motion (GtkWidget *widget,
+ GdkEventMotion *event);
GtkType
gtk_hpaned_get_type (void)
(GtkClassInitFunc) gtk_hpaned_class_init,
(GtkObjectInitFunc) gtk_hpaned_init,
/* reserved_1 */ NULL,
- /* reserved_2 */ NULL,
- (GtkClassInitFunc) NULL,
+ /* reserved_2 */ NULL,
+ (GtkClassInitFunc) NULL,
};
- hpaned_type = gtk_type_unique (gtk_paned_get_type (), &hpaned_info);
+ hpaned_type = gtk_type_unique (GTK_TYPE_PANED, &hpaned_info);
}
return hpaned_type;
{
GtkWidgetClass *widget_class;
- widget_class = (GtkWidgetClass*) class;
+ widget_class = (GtkWidgetClass *) class;
widget_class->size_request = gtk_hpaned_size_request;
widget_class->size_allocate = gtk_hpaned_size_allocate;
static void
gtk_hpaned_init (GtkHPaned *hpaned)
{
+ GtkPaned *paned;
+
+ g_return_if_fail (hpaned != NULL);
+ g_return_if_fail (GTK_IS_PANED (hpaned));
+
+ paned = GTK_PANED (hpaned);
+
+ paned->cursor_type = GDK_SB_H_DOUBLE_ARROW;
}
-GtkWidget*
+GtkWidget *
gtk_hpaned_new (void)
{
GtkHPaned *hpaned;
- hpaned = gtk_type_new (gtk_hpaned_get_type ());
+ hpaned = gtk_type_new (GTK_TYPE_HPANED);
return GTK_WIDGET (hpaned);
}
requisition->width += child_requisition.width;
}
- requisition->width += GTK_CONTAINER (paned)->border_width * 2 + paned->gutter_size;
+ requisition->width += GTK_CONTAINER (paned)->border_width * 2 + paned->handle_size;
requisition->height += GTK_CONTAINER (paned)->border_width * 2;
}
GtkRequisition child2_requisition;
GtkAllocation child1_allocation;
GtkAllocation child2_allocation;
- GdkRectangle old_groove_rectangle;
- guint16 border_width;
+ gint border_width;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_HPANED (widget));
g_return_if_fail (allocation != NULL);
widget->allocation = *allocation;
-
paned = GTK_PANED (widget);
border_width = GTK_CONTAINER (paned)->border_width;
-
+
if (paned->child1)
gtk_widget_get_child_requisition (paned->child1, &child1_requisition);
else
gtk_widget_get_child_requisition (paned->child2, &child2_requisition);
else
child2_requisition.width = 0;
-
+
gtk_paned_compute_position (paned,
- widget->allocation.width
- - paned->gutter_size
- - 2 * border_width,
+ MAX (1, (gint) widget->allocation.width
+ - (gint) paned->handle_size
+ - 2 * border_width),
child1_requisition.width,
child2_requisition.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;
+ paned->handle_xpos = paned->child1_size + border_width;
+ paned->handle_ypos = border_width;
+ paned->handle_width = paned->handle_size;
+ paned->handle_height = MAX (1, (gint) widget->allocation.height - 2 * border_width);
if (GTK_WIDGET_REALIZED (widget))
{
gdk_window_move_resize (widget->window,
allocation->x, allocation->y,
- allocation->width, allocation->height);
-
- gdk_window_move (paned->handle, paned->handle_xpos, paned->handle_ypos);
+ allocation->width,
+ allocation->height);
+
+ gdk_window_move_resize (paned->handle,
+ paned->handle_xpos,
+ paned->handle_ypos,
+ paned->handle_size,
+ paned->handle_height);
}
- child1_allocation.height = child2_allocation.height = MAX (1, (gint)allocation->height - border_width * 2);
+ child1_allocation.height = child2_allocation.height = MAX (1, (gint) allocation->height - border_width * 2);
child1_allocation.width = paned->child1_size;
child1_allocation.x = border_width;
child1_allocation.y = child2_allocation.y = border_width;
- old_groove_rectangle = paned->groove_rectangle;
-
- 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;
-
- if (GTK_WIDGET_DRAWABLE (widget) &&
- ((paned->groove_rectangle.x != old_groove_rectangle.x) ||
- (paned->groove_rectangle.y != old_groove_rectangle.y) ||
- (paned->groove_rectangle.width != old_groove_rectangle.width) ||
- (paned->groove_rectangle.height != old_groove_rectangle.height)))
- {
- gtk_widget_queue_clear_area (widget,
- old_groove_rectangle.x,
- old_groove_rectangle.y,
- old_groove_rectangle.width,
- old_groove_rectangle.height);
- gtk_widget_queue_draw_area (widget,
- paned->groove_rectangle.x,
- paned->groove_rectangle.y,
- paned->groove_rectangle.width,
- paned->groove_rectangle.height);
- }
-
- child2_allocation.x = paned->groove_rectangle.x + paned->gutter_size / 2 + 1;
- child2_allocation.width = MAX (1, (gint)allocation->width
- - child2_allocation.x - border_width);
-
+ child2_allocation.x = child1_allocation.x + child1_allocation.width + paned->handle_width;
+ child2_allocation.width = MAX (1, (gint) 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) &&
+ 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_widget_size_allocate (paned->child1, &child1_allocation);
}
else
{
static void
gtk_hpaned_draw (GtkWidget *widget,
- GdkRectangle *area)
+ GdkRectangle *area)
{
GtkPaned *paned;
- GdkRectangle child_area;
+ GdkRectangle handle_area, 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))
+ if (GTK_WIDGET_VISIBLE (widget) && GTK_WIDGET_MAPPED (widget))
{
paned = GTK_PANED (widget);
border_width = GTK_CONTAINER (paned)->border_width;
gdk_window_clear_area (widget->window,
- area->x, area->y, area->width, area->height);
- 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);
-
- gtk_paint_vline(widget->style, widget->window, GTK_STATE_NORMAL,
- area, widget, "hpaned",
- 0, widget->allocation.height - 1,
- border_width + paned->child1_size + paned->gutter_size / 2 - 1);
+ area->x, area->y, area->width,
+ area->height);
+
+ 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;
+
+ gtk_paint_handle (widget->style,
+ paned->handle,
+ GTK_STATE_NORMAL,
+ GTK_SHADOW_NONE,
+ &child_area,
+ widget,
+ "paned",
+ 0, 0, -1, -1,
+ GTK_ORIENTATION_VERTICAL);
+
+ }
+ /* Redraw the children
+ */
+ 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);
}
}
if (!paned->xor_gc)
{
- values.foreground = widget->style->white;
- values.function = GDK_XOR;
+ values.function = GDK_INVERT;
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);
+ 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);
+
xpos = paned->child1_size
- + GTK_CONTAINER(paned)->border_width + paned->gutter_size / 2;
+ + GTK_CONTAINER (paned)->border_width + paned->handle_size / 2;
gdk_draw_line (widget->window, paned->xor_gc,
xpos,
widget->allocation.height - 1);
}
-static gint
-gtk_hpaned_button_press (GtkWidget *widget, GdkEventButton *event)
+static gboolean
+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);
+ 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))
+ 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);
+ 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);
+ widget->allocation.width
+ - paned->handle_size
+ - 2 * GTK_CONTAINER (paned)->border_width);
gtk_hpaned_xor_line (paned);
+
+ return TRUE;
}
- return TRUE;
+ return FALSE;
}
-static gint
-gtk_hpaned_button_release (GtkWidget *widget, GdkEventButton *event)
+static gboolean
+gtk_hpaned_button_release (GtkWidget *widget,
+ GdkEventButton *event)
{
GtkPaned *paned;
- g_return_val_if_fail (widget != NULL,FALSE);
- g_return_val_if_fail (GTK_IS_PANED (widget),FALSE);
+ g_return_val_if_fail (widget != NULL, FALSE);
+ g_return_val_if_fail (GTK_IS_PANED (widget), FALSE);
paned = GTK_PANED (widget);
paned->position_set = TRUE;
gdk_pointer_ungrab (event->time);
gtk_widget_queue_resize (GTK_WIDGET (paned));
+
+ return TRUE;
}
- return TRUE;
+ return FALSE;
}
-static gint
-gtk_hpaned_motion (GtkWidget *widget, GdkEventMotion *event)
+static gboolean
+gtk_hpaned_motion (GtkWidget *widget,
+ GdkEventMotion *event)
{
GtkPaned *paned;
gint x;
if (paned->in_drag)
{
- gint size = x - GTK_CONTAINER (paned)->border_width - paned->gutter_size/2;
-
+ gint size = x - GTK_CONTAINER (paned)->border_width - paned->handle_size / 2;
+
gtk_hpaned_xor_line (paned);
- paned->child1_size = CLAMP (size,
- paned->min_position,
- paned->max_position);
+ paned->child1_size = CLAMP (size, paned->min_position, paned->max_position);
gtk_hpaned_xor_line (paned);
}
projects / ~andy / gtk / blobdiff