From 49390b4e0047fbb33312988906b95e673ce146db Mon Sep 17 00:00:00 2001 From: Marco Pesenti Gritti Date: Thu, 1 Jul 2004 09:51:21 +0000 Subject: Do not allow dragging out of edit mode on ITEMS_ONLY toolbars. 2004-07-01 Marco Pesenti Gritti * lib/egg/egg-editable-toolbar.c: (toolbar_drag_motion_cb): Do not allow dragging out of edit mode on ITEMS_ONLY toolbars. --- lib/egg/egg-editable-toolbar.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'lib/egg') diff --git a/lib/egg/egg-editable-toolbar.c b/lib/egg/egg-editable-toolbar.c index 1006a1e02..3ad616b1c 100755 --- a/lib/egg/egg-editable-toolbar.c +++ b/lib/egg/egg-editable-toolbar.c @@ -615,9 +615,10 @@ toolbar_drag_motion_cb (GtkWidget *widget, pos = get_toolbar_position (etoolbar, widget); flags = egg_toolbars_model_get_flags (etoolbar->priv->model, pos); - if ((flags & EGG_TB_MODEL_ACCEPT_ITEMS_ONLY) && - !gtk_widget_get_ancestor (source, EGG_TYPE_EDITABLE_TOOLBAR) && - !gtk_widget_get_ancestor (source, EGG_TYPE_TOOLBAR_EDITOR)) + if (!etoolbar->priv->edit_mode || + ((flags & EGG_TB_MODEL_ACCEPT_ITEMS_ONLY) && + !gtk_widget_get_ancestor (source, EGG_TYPE_EDITABLE_TOOLBAR) && + !gtk_widget_get_ancestor (source, EGG_TYPE_TOOLBAR_EDITOR))) { gdk_drag_status (context, 0, time); return FALSE; -- cgit v1.2.3