* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * 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-1999. 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 <stdlib.h>
-#include "gdk/gdkx.h"
#include "gtkhandlebox.h"
#include "gtkmain.h"
#include "gtksignal.h"
#include "gtkwindow.h"
+enum {
+ ARG_0,
+ ARG_SHADOW,
+ ARG_HANDLE_POSITION,
+ ARG_SNAP_EDGE
+};
#define DRAG_HANDLE_SIZE 10
#define CHILDLESS_SIZE 25
#define GHOST_HEIGHT 3
+#define TOLERANCE 5
-enum
-{
+enum {
SIGNAL_CHILD_ATTACHED,
SIGNAL_CHILD_DETACHED,
SIGNAL_LAST
};
-typedef void (*SignalChildAttached) (GtkObject *object,
- GtkWidget *widget,
- gpointer func_data);
+/* The algorithm for docking and redocking implemented here
+ * has a couple of nice properties:
+ *
+ * 1) During a single drag, docking always occurs at the
+ * the same cursor position. This means that the users
+ * motions are reversible, and that you won't
+ * undock/dock oscillations.
+ *
+ * 2) Docking generally occurs at user-visible features.
+ * The user, once they figure out to redock, will
+ * have useful information about doing it again in
+ * the future.
+ *
+ * Please try to preserve these properties if you
+ * change the algorithm. (And the current algorithm
+ * is far from ideal). Briefly, the current algorithm
+ * for deciding whether the handlebox is docked or not:
+ *
+ * 1) The decision is done by comparing two rectangles - the
+ * allocation if the widget at the start of the drag,
+ * and the boundary of hb->bin_window at the start of
+ * of the drag offset by the distance that the cursor
+ * has moved.
+ *
+ * 2) These rectangles must have one edge, the "snap_edge"
+ * of the handlebox, aligned within TOLERANCE.
+ *
+ * 3) On the other dimension, the extents of one rectangle
+ * must be contained in the extents of the other,
+ * extended by tolerance. That is, either we can have:
+ *
+ * <-TOLERANCE-|--------bin_window--------------|-TOLERANCE->
+ * <--------float_window-------------------->
+ *
+ * or we can have:
+ *
+ * <-TOLERANCE-|------float_window--------------|-TOLERANCE->
+ * <--------bin_window-------------------->
+ */
static void gtk_handle_box_class_init (GtkHandleBoxClass *klass);
static void gtk_handle_box_init (GtkHandleBox *handle_box);
+static void gtk_handle_box_set_arg (GtkObject *object,
+ GtkArg *arg,
+ guint arg_id);
+static void gtk_handle_box_get_arg (GtkObject *object,
+ GtkArg *arg,
+ guint arg_id);
static void gtk_handle_box_destroy (GtkObject *object);
static void gtk_handle_box_map (GtkWidget *widget);
static void gtk_handle_box_unmap (GtkWidget *widget);
static void gtk_handle_box_realize (GtkWidget *widget);
static void gtk_handle_box_unrealize (GtkWidget *widget);
+static void gtk_handle_box_style_set (GtkWidget *widget,
+ GtkStyle *previous_style);
static void gtk_handle_box_size_request (GtkWidget *widget,
GtkRequisition *requisition);
static void gtk_handle_box_size_allocate (GtkWidget *widget,
GdkEventMotion *event);
static gint gtk_handle_box_delete_event (GtkWidget *widget,
GdkEventAny *event);
+static void gtk_handle_box_reattach (GtkHandleBox *hb);
static GtkBinClass *parent_class;
static guint handle_box_signals[SIGNAL_LAST] = { 0 };
-guint
+GtkType
gtk_handle_box_get_type (void)
{
- static guint handle_box_type = 0;
+ static GtkType handle_box_type = 0;
if (!handle_box_type)
{
- GtkTypeInfo handle_box_info =
+ static const GtkTypeInfo handle_box_info =
{
"GtkHandleBox",
sizeof (GtkHandleBox),
sizeof (GtkHandleBoxClass),
(GtkClassInitFunc) gtk_handle_box_class_init,
(GtkObjectInitFunc) gtk_handle_box_init,
- (GtkArgSetFunc) NULL,
- (GtkArgGetFunc) NULL,
+ /* reserved_1 */ NULL,
+ /* reserved_2 */ NULL,
+ (GtkClassInitFunc) NULL,
};
- handle_box_type = gtk_type_unique (gtk_bin_get_type (), &handle_box_info);
+ handle_box_type = gtk_type_unique (GTK_TYPE_BIN, &handle_box_info);
}
return handle_box_type;
}
-static void
-gtk_handle_box_marshal_child_attached (GtkObject *object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg *args)
-{
- SignalChildAttached sfunc = (SignalChildAttached) func;
-
- (* sfunc) (object,
- (GtkWidget*) GTK_VALUE_OBJECT (args[0]),
- func_data);
-}
-
static void
gtk_handle_box_class_init (GtkHandleBoxClass *class)
{
widget_class = (GtkWidgetClass *) class;
container_class = (GtkContainerClass *) class;
- parent_class = gtk_type_class (gtk_bin_get_type ());
+ parent_class = gtk_type_class (GTK_TYPE_BIN);
+
+ gtk_object_add_arg_type ("GtkHandleBox::shadow", GTK_TYPE_SHADOW_TYPE, GTK_ARG_READWRITE, ARG_SHADOW);
+ gtk_object_add_arg_type ("GtkHandleBox::handle_position", GTK_TYPE_POSITION_TYPE, GTK_ARG_READWRITE, ARG_HANDLE_POSITION);
+ gtk_object_add_arg_type ("GtkHandleBox::snap_edge", GTK_TYPE_POSITION_TYPE, GTK_ARG_READWRITE, ARG_SNAP_EDGE);
+ object_class->set_arg = gtk_handle_box_set_arg;
+ object_class->get_arg = gtk_handle_box_get_arg;
+
handle_box_signals[SIGNAL_CHILD_ATTACHED] =
gtk_signal_new ("child_attached",
GTK_RUN_FIRST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkHandleBoxClass, child_attached),
- gtk_handle_box_marshal_child_attached,
+ gtk_marshal_NONE__POINTER,
GTK_TYPE_NONE, 1,
GTK_TYPE_WIDGET);
handle_box_signals[SIGNAL_CHILD_DETACHED] =
GTK_RUN_FIRST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkHandleBoxClass, child_detached),
- gtk_handle_box_marshal_child_attached,
+ gtk_marshal_NONE__POINTER,
GTK_TYPE_NONE, 1,
GTK_TYPE_WIDGET);
gtk_object_class_add_signals (object_class, handle_box_signals, SIGNAL_LAST);
widget_class->unmap = gtk_handle_box_unmap;
widget_class->realize = gtk_handle_box_realize;
widget_class->unrealize = gtk_handle_box_unrealize;
+ widget_class->style_set = gtk_handle_box_style_set;
widget_class->size_request = gtk_handle_box_size_request;
widget_class->size_allocate = gtk_handle_box_size_allocate;
widget_class->draw = gtk_handle_box_draw;
gtk_handle_box_init (GtkHandleBox *handle_box)
{
GTK_WIDGET_UNSET_FLAGS (handle_box, GTK_NO_WINDOW);
- GTK_WIDGET_SET_FLAGS (handle_box, GTK_BASIC); /* FIXME: are we really a basic widget? */
handle_box->bin_window = NULL;
handle_box->float_window = NULL;
+ handle_box->shadow_type = GTK_SHADOW_OUT;
handle_box->handle_position = GTK_POS_LEFT;
handle_box->float_window_mapped = FALSE;
handle_box->child_detached = FALSE;
handle_box->in_drag = FALSE;
handle_box->shrink_on_detach = TRUE;
- handle_box->fleur_cursor = gdk_cursor_new (GDK_FLEUR);
- handle_box->dragoff_x = 0;
- handle_box->dragoff_y = 0;
+ handle_box->snap_edge = -1;
+}
+
+static void
+gtk_handle_box_set_arg (GtkObject *object,
+ GtkArg *arg,
+ guint arg_id)
+{
+ GtkHandleBox *handle_box = GTK_HANDLE_BOX (object);
+
+ switch (arg_id)
+ {
+ case ARG_SHADOW:
+ gtk_handle_box_set_shadow_type (handle_box, GTK_VALUE_ENUM (*arg));
+ break;
+ case ARG_HANDLE_POSITION:
+ gtk_handle_box_set_handle_position (handle_box, GTK_VALUE_ENUM (*arg));
+ break;
+ case ARG_SNAP_EDGE:
+ gtk_handle_box_set_snap_edge (handle_box, GTK_VALUE_ENUM (*arg));
+ break;
+ }
}
+static void
+gtk_handle_box_get_arg (GtkObject *object,
+ GtkArg *arg,
+ guint arg_id)
+{
+ GtkHandleBox *handle_box = GTK_HANDLE_BOX (object);
+
+ switch (arg_id)
+ {
+ case ARG_SHADOW:
+ GTK_VALUE_ENUM (*arg) = handle_box->shadow_type;
+ break;
+ case ARG_HANDLE_POSITION:
+ GTK_VALUE_ENUM (*arg) = handle_box->handle_position;
+ break;
+ case ARG_SNAP_EDGE:
+ GTK_VALUE_ENUM (*arg) = handle_box->snap_edge;
+ break;
+ default:
+ arg->type = GTK_TYPE_INVALID;
+ break;
+ }
+}
+
GtkWidget*
gtk_handle_box_new (void)
{
bin = GTK_BIN (widget);
hb = GTK_HANDLE_BOX (widget);
- gdk_window_show (hb->bin_window);
- gdk_window_show (widget->window);
+ if (bin->child &&
+ GTK_WIDGET_VISIBLE (bin->child) &&
+ !GTK_WIDGET_MAPPED (bin->child))
+ gtk_widget_map (bin->child);
if (hb->child_detached && !hb->float_window_mapped)
{
hb->float_window_mapped = TRUE;
}
- if (bin->child &&
- GTK_WIDGET_VISIBLE (bin->child) &&
- !GTK_WIDGET_MAPPED (bin->child))
- gtk_widget_map (bin->child);
+ gdk_window_show (hb->bin_window);
+ gdk_window_show (widget->window);
}
static void
gdk_window_set_user_data (hb->float_window, widget);
gdk_window_set_decorations (hb->float_window, 0);
-
widget->style = gtk_style_attach (widget->style, widget->window);
gtk_style_set_background (widget->style, widget->window, GTK_WIDGET_STATE (hb));
gtk_style_set_background (widget->style, hb->bin_window, GTK_WIDGET_STATE (hb));
gtk_style_set_background (widget->style, hb->float_window, GTK_WIDGET_STATE (hb));
+ gdk_window_set_back_pixmap (widget->window, NULL, TRUE);
}
static void
gdk_window_destroy (hb->float_window);
hb->float_window = NULL;
- gdk_cursor_destroy (hb->fleur_cursor);
- hb->fleur_cursor = NULL;
-
if (GTK_WIDGET_CLASS (parent_class)->unrealize)
(* GTK_WIDGET_CLASS (parent_class)->unrealize) (widget);
}
+static void
+gtk_handle_box_style_set (GtkWidget *widget,
+ GtkStyle *previous_style)
+{
+ GtkHandleBox *hb;
+
+ g_return_if_fail (widget != NULL);
+ g_return_if_fail (GTK_IS_HANDLE_BOX (widget));
+
+ hb = GTK_HANDLE_BOX (widget);
+
+ if (GTK_WIDGET_REALIZED (widget) &&
+ !GTK_WIDGET_NO_WINDOW (widget))
+ {
+ gtk_style_set_background (widget->style, widget->window,
+widget->state);
+ gtk_style_set_background (widget->style, hb->bin_window, widget->state);
+ gtk_style_set_background (widget->style, hb->float_window, widget->state);
+ }
+}
+
static void
gtk_handle_box_size_request (GtkWidget *widget,
GtkRequisition *requisition)
{
GtkBin *bin;
GtkHandleBox *hb;
+ GtkRequisition child_requisition;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_HANDLE_BOX (widget));
* won't have any usefull hint for our size otherwise.
*/
if (bin->child)
- gtk_widget_size_request (bin->child, &bin->child->requisition);
+ gtk_widget_size_request (bin->child, &child_requisition);
+ else
+ {
+ child_requisition.width = 0;
+ child_requisition.height = 0;
+ }
if (hb->child_detached)
{
+ /* FIXME: This doesn't work currently */
if (!hb->shrink_on_detach)
{
if (hb->handle_position == GTK_POS_LEFT ||
hb->handle_position == GTK_POS_RIGHT)
- requisition->height += bin->child->requisition.height;
+ requisition->height += child_requisition.height;
else
- requisition->width += bin->child->requisition.width;
+ requisition->width += child_requisition.width;
}
else
{
if (bin->child)
{
- requisition->width += bin->child->requisition.width;
- requisition->height += bin->child->requisition.height;
+ requisition->width += child_requisition.width;
+ requisition->height += child_requisition.height;
}
else
{
{
GtkBin *bin;
GtkHandleBox *hb;
+ GtkRequisition child_requisition;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_HANDLE_BOX (widget));
bin = GTK_BIN (widget);
hb = GTK_HANDLE_BOX (widget);
- widget->allocation.x = allocation->x;
-
- if (hb->child_detached)
- {
- guint max_req_height;
- guint max_req_width;
-
- max_req_height = MAX (widget->requisition.height,
- bin->child->requisition.height +
- 2 * widget->style->klass->ythickness);
- max_req_width = MAX (widget->requisition.width,
- bin->child->requisition.width +
- 2 * widget->style->klass->xthickness);
-
- if (allocation->height > max_req_height)
- widget->allocation.y = allocation->y +
- (allocation->height - max_req_height) / 2;
- else
- widget->allocation.y = allocation->y;
-
- widget->allocation.height = MIN (allocation->height, max_req_height);
- widget->allocation.width = MIN (allocation->width, max_req_width);
- }
+ if (bin->child)
+ gtk_widget_get_child_requisition (bin->child, &child_requisition);
else
{
- widget->allocation = *allocation;
- }
+ child_requisition.width = 0;
+ child_requisition.height = 0;
+ }
+
+ widget->allocation = *allocation;
if (GTK_WIDGET_REALIZED (hb))
gdk_window_move_resize (widget->window,
guint float_width;
guint float_height;
- child_allocation.width = child->requisition.width;
- child_allocation.height = child->requisition.height;
+ child_allocation.width = child_requisition.width;
+ child_allocation.height = child_requisition.height;
float_width = child_allocation.width + 2 * border_width;
float_height = child_allocation.height + 2 * border_width;
}
else
{
- child_allocation.width = MAX (1, widget->allocation.width - 2 * border_width);
- child_allocation.height = MAX (1, widget->allocation.height - 2 * border_width);
+ child_allocation.width = MAX (1, (gint)widget->allocation.width - 2 * border_width);
+ child_allocation.height = MAX (1, (gint)widget->allocation.height - 2 * border_width);
if (hb->handle_position == GTK_POS_LEFT ||
hb->handle_position == GTK_POS_RIGHT)
if (hb->handle_position == GTK_POS_LEFT ||
hb->handle_position == GTK_POS_RIGHT)
{
- x = hb->handle_position == GTK_POS_LEFT ? 0 : widget->allocation.width;
+ x = hb->handle_position == GTK_POS_LEFT ? 0 : widget->allocation.width - DRAG_HANDLE_SIZE;
y = 0;
width = DRAG_HANDLE_SIZE;
height = widget->allocation.height;
else
{
x = 0;
- y = hb->handle_position == GTK_POS_TOP ? 0 : widget->allocation.height;
+ y = hb->handle_position == GTK_POS_TOP ? 0 : widget->allocation.height - DRAG_HANDLE_SIZE;
width = widget->allocation.width;
height = DRAG_HANDLE_SIZE;
}
- gtk_draw_shadow (widget->style,
- widget->window,
- GTK_WIDGET_STATE (widget),
- GTK_SHADOW_ETCHED_IN,
- x,
- y,
- width,
- height);
- /*
- if (hb->handle_position == GTK_POS_LEFT ||
- hb->handle_position == GTK_POS_RIGHT)
- gtk_draw_hline (widget->style,
+ gtk_paint_shadow (widget->style,
widget->window,
GTK_WIDGET_STATE (widget),
- hb->handle_position == GTK_POS_LEFT ? DRAG_HANDLE_SIZE : widget->allocation.width - DRAG_HANDLE_SIZE,
- widget->allocation.width - DRAG_HANDLE_SIZE,
- widget->allocation.height / 2);
- else
- gtk_draw_vline (widget->style,
- widget->window,
- GTK_WIDGET_STATE (widget),
- hb->handle_position == GTK_POS_TOP ? DRAG_HANDLE_SIZE : widget->allocation.height - DRAG_HANDLE_SIZE,
- widget->allocation.height - DRAG_HANDLE_SIZE,
- widget->allocation.width / 2);
- */
+ GTK_SHADOW_ETCHED_IN,
+ NULL, widget, "handle",
+ x,
+ y,
+ width,
+ height);
+ if (hb->handle_position == GTK_POS_LEFT ||
+ hb->handle_position == GTK_POS_RIGHT)
+ gtk_paint_hline (widget->style,
+ widget->window,
+ GTK_WIDGET_STATE (widget),
+ NULL, widget, "handlebox",
+ hb->handle_position == GTK_POS_LEFT ? DRAG_HANDLE_SIZE : 0,
+ hb->handle_position == GTK_POS_LEFT ? widget->allocation.width : widget->allocation.width - DRAG_HANDLE_SIZE,
+ widget->allocation.height / 2);
+ else
+ gtk_paint_vline (widget->style,
+ widget->window,
+ GTK_WIDGET_STATE (widget),
+ NULL, widget, "handlebox",
+ hb->handle_position == GTK_POS_TOP ? DRAG_HANDLE_SIZE : 0,
+ hb->handle_position == GTK_POS_TOP ? widget->allocation.height : widget->allocation.height - DRAG_HANDLE_SIZE,
+ widget->allocation.width / 2);
}
static void
-draw_textured_frame (GtkWidget *widget, GdkWindow *window, GdkRectangle *rect, GtkShadowType shadow)
+draw_textured_frame (GtkWidget *widget, GdkWindow *window, GdkRectangle *rect, GtkShadowType shadow,
+ GdkRectangle *clip)
{
- int x, y;
- int xthick, ythick;
- GdkGC *light_gc, *dark_gc;
+ gtk_paint_handle(widget->style, window, GTK_STATE_NORMAL, shadow,
+ clip, widget, "handlebox",
+ rect->x, rect->y, rect->width, rect->height,
+ GTK_ORIENTATION_VERTICAL);
+}
- gdk_draw_rectangle (window,
- widget->style->bg_gc[GTK_STATE_NORMAL],
- TRUE,
- rect->x, rect->y,
- rect->width, rect->height);
+void
+gtk_handle_box_set_shadow_type (GtkHandleBox *handle_box,
+ GtkShadowType type)
+{
+ g_return_if_fail (handle_box != NULL);
+ g_return_if_fail (GTK_IS_HANDLE_BOX (handle_box));
- light_gc = widget->style->light_gc[GTK_STATE_NORMAL];
- dark_gc = widget->style->dark_gc[GTK_STATE_NORMAL];
+ if ((GtkShadowType) handle_box->shadow_type != type)
+ {
+ handle_box->shadow_type = type;
+ gtk_widget_queue_resize (GTK_WIDGET (handle_box));
+ }
+}
- xthick = widget->style->klass->xthickness;
- ythick = widget->style->klass->ythickness;
+void
+gtk_handle_box_set_handle_position (GtkHandleBox *handle_box,
+ GtkPositionType position)
+{
+ if ((GtkPositionType) handle_box->handle_position != position)
+ {
+ handle_box->handle_position = position;
+ gtk_widget_queue_resize (GTK_WIDGET (handle_box));
+ }
+}
- gdk_gc_set_clip_rectangle (light_gc, rect);
- gdk_gc_set_clip_rectangle (dark_gc, rect);
+void
+gtk_handle_box_set_snap_edge (GtkHandleBox *handle_box,
+ GtkPositionType edge)
+{
+ g_return_if_fail (handle_box != NULL);
+ g_return_if_fail (GTK_IS_HANDLE_BOX (handle_box));
- for (y = rect->y + ythick; y < (rect->y + rect->height - ythick); y += 3)
- for (x = rect->x + xthick; x < (rect->x + rect->width - xthick); x += 6)
- {
- gdk_draw_point (window, light_gc, x, y);
- gdk_draw_point (window, dark_gc, x + 1, y + 1);
-
- gdk_draw_point (window, light_gc, x + 3, y + 1);
- gdk_draw_point (window, dark_gc, x + 4, y + 2);
- }
-
- gdk_gc_set_clip_rectangle (light_gc, NULL);
- gdk_gc_set_clip_rectangle (dark_gc, NULL);
-
- gtk_draw_shadow (widget->style, window,
- GTK_STATE_NORMAL, shadow,
- rect->x, rect->y,
- rect->width, rect->height);
+ handle_box->snap_edge = edge;
}
static void
GtkHandleBox *hb;
guint width;
guint height;
- guint border_width;
GdkRectangle rect;
+ GdkRectangle dest;
bin = GTK_BIN (widget);
hb = GTK_HANDLE_BOX (widget);
- border_width = GTK_CONTAINER (hb)->border_width;
-
- if (hb->child_detached)
- {
- width = bin->child->allocation.width + 2 * border_width;
- height = bin->child->allocation.height + 2 * border_width;
- }
- else if (hb->handle_position == GTK_POS_LEFT ||
- hb->handle_position == GTK_POS_RIGHT)
- {
- width = widget->allocation.width - DRAG_HANDLE_SIZE;
- height = widget->allocation.height;
- }
+ gdk_window_get_size (hb->bin_window, &width, &height);
+
+ if (!event)
+ gtk_paint_box(widget->style,
+ hb->bin_window,
+ GTK_WIDGET_STATE (widget),
+ hb->shadow_type,
+ area, widget, "handlebox_bin",
+ 0, 0, -1, -1);
else
+ gtk_paint_box(widget->style,
+ hb->bin_window,
+ GTK_WIDGET_STATE (widget),
+ hb->shadow_type,
+ &event->area, widget, "handlebox_bin",
+ 0, 0, -1, -1);
+
+/* We currently draw the handle _above_ the relief of the handlebox.
+ * it could also be drawn on the same level...
+
+ hb->handle_position == GTK_POS_LEFT ? DRAG_HANDLE_SIZE : 0,
+ hb->handle_position == GTK_POS_TOP ? DRAG_HANDLE_SIZE : 0,
+ width,
+ height);*/
+
+ switch (hb->handle_position)
{
- width = widget->allocation.width;
- height = widget->allocation.height - DRAG_HANDLE_SIZE;
+ case GTK_POS_LEFT:
+ rect.x = 0;
+ rect.y = 0;
+ rect.width = DRAG_HANDLE_SIZE;
+ rect.height = height;
+ break;
+ case GTK_POS_RIGHT:
+ rect.x = width - DRAG_HANDLE_SIZE;
+ rect.y = 0;
+ rect.width = DRAG_HANDLE_SIZE;
+ rect.height = height;
+ break;
+ case GTK_POS_TOP:
+ rect.x = 0;
+ rect.y = 0;
+ rect.width = width;
+ rect.height = DRAG_HANDLE_SIZE;
+ break;
+ case GTK_POS_BOTTOM:
+ rect.x = 0;
+ rect.y = height - DRAG_HANDLE_SIZE;
+ rect.width = width;
+ rect.height = DRAG_HANDLE_SIZE;
+ break;
}
-
- if (!event)
- gdk_window_clear_area (hb->bin_window,
- area->x,
- area->y,
- area->width,
- area->height);
-
- gtk_draw_shadow (widget->style,
- hb->bin_window,
- GTK_WIDGET_STATE (widget),
- GTK_SHADOW_OUT,
- hb->handle_position == GTK_POS_LEFT ? DRAG_HANDLE_SIZE : 0,
- hb->handle_position == GTK_POS_TOP ? DRAG_HANDLE_SIZE : 0,
- width,
- height);
-
- rect.x = 0;
- rect.y = 0;
- rect.width = (hb->handle_position == GTK_POS_LEFT) ? DRAG_HANDLE_SIZE : width;
- rect.height = (hb->handle_position == GTK_POS_TOP) ? DRAG_HANDLE_SIZE : height;
-
- draw_textured_frame (widget, hb->bin_window, &rect, GTK_SHADOW_OUT);
+
+ if (gdk_rectangle_intersect (event ? &event->area : area, &rect, &dest))
+ draw_textured_frame (widget, hb->bin_window, &rect,
+ GTK_SHADOW_OUT,
+ event ? &event->area : area);
if (bin->child && GTK_WIDGET_VISIBLE (bin->child))
{
{
GtkHandleBox *hb;
gboolean event_handled;
+ GdkCursor *fleur;
g_return_val_if_fail (widget != NULL, FALSE);
g_return_val_if_fail (GTK_IS_HANDLE_BOX (widget), FALSE);
hb = GTK_HANDLE_BOX (widget);
event_handled = FALSE;
- if (event->button == 1 &&
- event->type == GDK_BUTTON_PRESS)
+ if ((event->button == 1) &&
+ (event->type == GDK_BUTTON_PRESS || event->type == GDK_2BUTTON_PRESS))
{
GtkWidget *child;
gboolean in_handle;
+ if (event->window != hb->bin_window)
+ return FALSE;
+
child = GTK_BIN (hb)->child;
switch (hb->handle_position)
if (in_handle)
{
- hb->dragoff_x = event->x;
- hb->dragoff_y = event->y;
-
- gtk_grab_add (widget);
- hb->in_drag = TRUE;
- while (gdk_pointer_grab (hb->bin_window,
- FALSE,
- (GDK_BUTTON1_MOTION_MASK |
- GDK_POINTER_MOTION_HINT_MASK |
- GDK_BUTTON_RELEASE_MASK),
- NULL,
- hb->fleur_cursor,
- GDK_CURRENT_TIME) != 0); /* wait for success */
- event_handled = TRUE;
+ if (event->type == GDK_BUTTON_PRESS) /* Start a drag */
+ {
+ gint desk_x, desk_y;
+ gint root_x, root_y;
+ gint width, height;
+
+ gdk_window_get_deskrelative_origin (hb->bin_window, &desk_x, &desk_y);
+ gdk_window_get_origin (hb->bin_window, &root_x, &root_y);
+ gdk_window_get_size (hb->bin_window, &width, &height);
+
+ hb->float_allocation.x = root_x - event->x_root;
+ hb->float_allocation.y = root_y - event->y_root;
+ hb->float_allocation.width = width;
+ hb->float_allocation.height = height;
+
+ hb->deskoff_x = desk_x - root_x;
+ hb->deskoff_y = desk_y - root_y;
+
+ gdk_window_get_origin (widget->window, &root_x, &root_y);
+ gdk_window_get_size (widget->window, &width, &height);
+
+ hb->attach_allocation.x = root_x;
+ hb->attach_allocation.y = root_y;
+ hb->attach_allocation.width = width;
+ hb->attach_allocation.height = height;
+
+ hb->in_drag = TRUE;
+ fleur = gdk_cursor_new (GDK_FLEUR);
+ if (gdk_pointer_grab (widget->window,
+ FALSE,
+ (GDK_BUTTON1_MOTION_MASK |
+ GDK_POINTER_MOTION_HINT_MASK |
+ GDK_BUTTON_RELEASE_MASK),
+ NULL,
+ fleur,
+ GDK_CURRENT_TIME) != 0)
+ {
+ hb->in_drag = FALSE;
+ }
+
+ gdk_cursor_destroy (fleur);
+ event_handled = TRUE;
+ }
+ else if (hb->child_detached) /* Double click */
+ {
+ gtk_handle_box_reattach (hb);
+ }
}
}
else if (event->type == GDK_BUTTON_RELEASE &&
hb->in_drag)
{
+ if (event->window != widget->window)
+ return FALSE;
+
gdk_pointer_ungrab (GDK_CURRENT_TIME);
- gtk_grab_remove (widget);
hb->in_drag = FALSE;
event_handled = TRUE;
}
{
GtkHandleBox *hb;
gint new_x, new_y;
- gint ox, oy;
- gint snap_x, snap_y;
- gboolean in_handle;
+ gint snap_edge;
+ gboolean is_snapped = FALSE;
g_return_val_if_fail (widget != NULL, FALSE);
g_return_val_if_fail (GTK_IS_HANDLE_BOX (widget), FALSE);
if (!hb->in_drag)
return FALSE;
- ox = 0;
- oy = 0;
- gdk_window_get_origin (hb->float_window, &ox, &oy);
+ if (!hb->in_drag || (event->window != widget->window))
+ return FALSE;
+
+ /* Calculate the attachment point on the float, if the float
+ * were detached
+ */
new_x = 0;
new_y = 0;
- gdk_window_get_pointer (hb->float_window, &new_x, &new_y, NULL);
- new_x += ox;
- new_y += oy;
- new_x -= hb->dragoff_x;
- new_y -= hb->dragoff_y;
- snap_x = 0;
- snap_y = 0;
- gdk_window_get_pointer (widget->window, &snap_x, &snap_y, NULL);
-
- switch (hb->handle_position)
+ gdk_window_get_pointer (NULL, &new_x, &new_y, NULL);
+ new_x += hb->float_allocation.x;
+ new_y += hb->float_allocation.y;
+
+ snap_edge = hb->snap_edge;
+ if (snap_edge == -1)
+ snap_edge = (hb->handle_position == GTK_POS_LEFT ||
+ hb->handle_position == GTK_POS_RIGHT) ?
+ GTK_POS_TOP : GTK_POS_LEFT;
+
+ /* First, check if the snapped edge is aligned
+ */
+ switch (snap_edge)
{
- case GTK_POS_LEFT:
- in_handle = (snap_x >= 0 && snap_x <= DRAG_HANDLE_SIZE &&
- snap_y >= 0 && snap_y <= widget->allocation.height);
- break;
case GTK_POS_TOP:
- in_handle = (snap_x >= 0 && snap_x <= widget->allocation.width &&
- snap_y >= 0 && snap_y <= DRAG_HANDLE_SIZE);
- break;
- case GTK_POS_RIGHT:
- in_handle = (snap_x >= widget->allocation.width - DRAG_HANDLE_SIZE && snap_x <= widget->allocation.width &&
- snap_y >= 0 && snap_y <= widget->allocation.height);
+ is_snapped = abs (hb->attach_allocation.y - new_y) < TOLERANCE;
break;
case GTK_POS_BOTTOM:
- in_handle = (snap_x >= 0 && snap_x <= widget->allocation.width &&
- snap_y >= widget->allocation.height - DRAG_HANDLE_SIZE && snap_y <= widget->allocation.height);
+ is_snapped = abs (hb->attach_allocation.y + (gint)hb->attach_allocation.height -
+ new_y - (gint)hb->float_allocation.height) < TOLERANCE;
break;
- default:
- in_handle = FALSE;
+ case GTK_POS_LEFT:
+ is_snapped = abs (hb->attach_allocation.x - new_x) < TOLERANCE;
+ break;
+ case GTK_POS_RIGHT:
+ is_snapped = abs (hb->attach_allocation.x + (gint)hb->attach_allocation.width -
+ new_x - (gint)hb->float_allocation.width) < TOLERANCE;
break;
}
- if (in_handle)
+ /* Next, check if coordinates in the other direction are sufficiently
+ * aligned
+ */
+ if (is_snapped)
+ {
+ gint float_pos1 = 0; /* Initialize to suppress warnings */
+ gint float_pos2 = 0;
+ gint attach_pos1 = 0;
+ gint attach_pos2 = 0;
+
+ switch (snap_edge)
+ {
+ case GTK_POS_TOP:
+ case GTK_POS_BOTTOM:
+ attach_pos1 = hb->attach_allocation.x;
+ attach_pos2 = hb->attach_allocation.x + hb->attach_allocation.width;
+ float_pos1 = new_x;
+ float_pos2 = new_x + hb->float_allocation.width;
+ break;
+ case GTK_POS_LEFT:
+ case GTK_POS_RIGHT:
+ attach_pos1 = hb->attach_allocation.y;
+ attach_pos2 = hb->attach_allocation.y + hb->attach_allocation.height;
+ float_pos1 = new_y;
+ float_pos2 = new_y + hb->float_allocation.height;
+ break;
+ }
+
+ is_snapped = ((attach_pos1 - TOLERANCE < float_pos1) &&
+ (attach_pos2 + TOLERANCE > float_pos2)) ||
+ ((float_pos1 - TOLERANCE < attach_pos1) &&
+ (float_pos2 + TOLERANCE > attach_pos2));
+ }
+
+ if (is_snapped)
{
if (hb->child_detached)
{
- gdk_pointer_ungrab (GDK_CURRENT_TIME);
-
hb->child_detached = FALSE;
gdk_window_hide (hb->float_window);
gdk_window_reparent (hb->bin_window, widget->window, 0, 0);
handle_box_signals[SIGNAL_CHILD_ATTACHED],
GTK_BIN (hb)->child);
- while (gdk_pointer_grab (hb->bin_window,
- FALSE,
- (GDK_BUTTON1_MOTION_MASK |
- GDK_POINTER_MOTION_HINT_MASK |
- GDK_BUTTON_RELEASE_MASK),
- NULL,
- hb->fleur_cursor,
- GDK_CURRENT_TIME) != 0); /* wait for success */
-
gtk_widget_queue_resize (widget);
}
}
else
{
+ gint width, height;
+
+ gdk_window_get_size (hb->float_window, &width, &height);
+ new_x += hb->deskoff_x;
+ new_y += hb->deskoff_y;
+
+ switch (hb->handle_position)
+ {
+ case GTK_POS_LEFT:
+ new_y += ((gint)hb->float_allocation.height - height) / 2;
+ break;
+ case GTK_POS_RIGHT:
+ new_x += (gint)hb->float_allocation.width - width;
+ new_y += ((gint)hb->float_allocation.height - height) / 2;
+ break;
+ case GTK_POS_TOP:
+ new_x += ((gint)hb->float_allocation.width - width) / 2;
+ break;
+ case GTK_POS_BOTTOM:
+ new_x += ((gint)hb->float_allocation.width - width) / 2;
+ new_y += (gint)hb->float_allocation.height - height;
+ break;
+ }
+
if (hb->child_detached)
{
gdk_window_move (hb->float_window, new_x, new_y);
{
gint width;
gint height;
-
- gdk_pointer_ungrab (GDK_CURRENT_TIME);
+ GtkRequisition child_requisition;
hb->child_detached = TRUE;
- width = 0;
- height = 0;
- gdk_window_get_size (hb->bin_window, &width, &height);
+
+ if (GTK_BIN (hb)->child)
+ gtk_widget_get_child_requisition (GTK_BIN (hb)->child, &child_requisition);
+ else
+ {
+ child_requisition.width = 0;
+ child_requisition.height = 0;
+ }
+
+ width = child_requisition.width + 2 * GTK_CONTAINER (hb)->border_width;
+ height = child_requisition.height + 2 * GTK_CONTAINER (hb)->border_width;
gdk_window_move_resize (hb->float_window, new_x, new_y, width, height);
gdk_window_reparent (hb->bin_window, hb->float_window, 0, 0);
gdk_window_set_hints (hb->float_window, new_x, new_y, 0, 0, 0, 0, GDK_HINT_POS);
GTK_BIN (hb)->child);
gtk_handle_box_draw_ghost (hb);
- while (gdk_pointer_grab (hb->bin_window,
- FALSE,
- (GDK_BUTTON1_MOTION_MASK |
- GDK_POINTER_MOTION_HINT_MASK |
- GDK_BUTTON_RELEASE_MASK),
- NULL,
- hb->fleur_cursor,
- GDK_CURRENT_TIME) != 0); /* wait for success */
-
gtk_widget_queue_resize (widget);
}
}
gtk_handle_box_remove (GtkContainer *container,
GtkWidget *widget)
{
- GtkHandleBox *hb;
-
g_return_if_fail (GTK_IS_HANDLE_BOX (container));
g_return_if_fail (GTK_BIN (container)->child == widget);
- hb = GTK_HANDLE_BOX (container);
-
- if (hb->child_detached)
- {
- hb->child_detached = FALSE;
- if (GTK_WIDGET_REALIZED (hb))
- {
- gdk_window_hide (hb->float_window);
- gdk_window_reparent (hb->bin_window, GTK_WIDGET (hb)->window, 0, 0);
- }
- hb->float_window_mapped = FALSE;
- }
- if (hb->in_drag)
- {
- gdk_pointer_ungrab (GDK_CURRENT_TIME);
- gtk_grab_remove (GTK_WIDGET (container));
- hb->in_drag = FALSE;
- }
-
GTK_CONTAINER_CLASS (parent_class)->remove (container, widget);
+
+ gtk_handle_box_reattach (GTK_HANDLE_BOX (container));
}
static gint
g_return_val_if_fail (event != NULL, FALSE);
hb = GTK_HANDLE_BOX (widget);
- g_return_val_if_fail (event->window == hb->float_window, FALSE);
-
- hb->child_detached = FALSE;
- gdk_window_hide (hb->float_window);
- gdk_window_reparent (hb->bin_window, widget->window, 0, 0);
- hb->float_window_mapped = FALSE;
- gtk_signal_emit (GTK_OBJECT (hb),
- handle_box_signals[SIGNAL_CHILD_ATTACHED],
- GTK_BIN (hb)->child);
+
+ if (event->window == hb->float_window)
+ {
+ gtk_handle_box_reattach (hb);
+
+ return TRUE;
+ }
+
+ return FALSE;
+}
+
+static void
+gtk_handle_box_reattach (GtkHandleBox *hb)
+{
+ if (hb->child_detached)
+ {
+ hb->child_detached = FALSE;
+ if (GTK_WIDGET_REALIZED (hb))
+ {
+ gdk_window_hide (hb->float_window);
+ gdk_window_reparent (hb->bin_window, GTK_WIDGET (hb)->window, 0, 0);
+
+ if (GTK_BIN (hb)->child)
+ gtk_signal_emit (GTK_OBJECT (hb),
+ handle_box_signals[SIGNAL_CHILD_ATTACHED],
+ GTK_BIN (hb)->child);
+
+ }
+ hb->float_window_mapped = FALSE;
+ }
if (hb->in_drag)
{
gdk_pointer_ungrab (GDK_CURRENT_TIME);
- gtk_grab_remove (widget);
hb->in_drag = FALSE;
}
-
- gtk_widget_queue_resize (GTK_WIDGET (hb));
- return TRUE;
+ gtk_widget_queue_resize (GTK_WIDGET (hb));
}
projects / ~andy / gtk / blobdiff