[epiphany] toolbareditor: Fix the removal of items by DnD.
- From: Xan Lopez <xan src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [epiphany] toolbareditor: Fix the removal of items by DnD.
- Date: Mon, 27 Jun 2011 19:50:44 +0000 (UTC)
commit 972de8b227165ed15f65c6401698501bdcd34565
Author: Josà Aliste <jaliste src gnome org>
Date: Mon Jun 27 14:30:54 2011 -0400
toolbareditor: Fix the removal of items by DnD.
If the 'window-dragging' property of GtkToolbar is set (as it is in adwaita)
then the Toolbar starts the drag of the window on 'button-press' event.
We prevent this by connecting a handler for 'button-press' which prevents
the handler of the toolbar to be run while in edit mode.
Fixes bug #647265
lib/egg/egg-editable-toolbar.c | 32 ++++++++++++++++++++++++++++++++
1 files changed, 32 insertions(+), 0 deletions(-)
---
diff --git a/lib/egg/egg-editable-toolbar.c b/lib/egg/egg-editable-toolbar.c
index a9028aa..a27b88a 100644
--- a/lib/egg/egg-editable-toolbar.c
+++ b/lib/egg/egg-editable-toolbar.c
@@ -377,6 +377,19 @@ popup_context_menu_cb (GtkWidget *toolbar,
}
static gboolean
+edit_mode_button_press_event_cb (GtkWidget *widget,
+ GdkEventButton *event,
+ EggEditableToolbar *etoolbar)
+{
+ if (event->button == 1)
+ {
+ return TRUE;
+ }
+
+ return FALSE;
+}
+
+static gboolean
button_press_event_cb (GtkWidget *widget,
GdkEventButton *event,
EggEditableToolbar *etoolbar)
@@ -423,6 +436,23 @@ configure_item_sensitivity (GtkToolItem *item, EggEditableToolbar *etoolbar)
}
static void
+configure_item_window_drag (GtkToolItem *item,
+ EggEditableToolbar *etoolbar)
+{
+ if (etoolbar->priv->edit_mode > 0)
+ {
+ g_signal_connect (item, "button-press-event",
+ G_CALLBACK (edit_mode_button_press_event_cb), NULL);
+ }
+ else
+ {
+ g_signal_handlers_disconnect_by_func (item,
+ G_CALLBACK (edit_mode_button_press_event_cb),
+ NULL);
+ }
+}
+
+static void
configure_item_cursor (GtkToolItem *item,
EggEditableToolbar *etoolbar)
{
@@ -1215,6 +1245,7 @@ item_added_cb (EggToolbarsModel *model,
connect_widget_signals (GTK_WIDGET (item), etoolbar);
configure_item_tooltip (item);
configure_item_cursor (item, etoolbar);
+ configure_item_window_drag (item, etoolbar);
configure_item_sensitivity (item, etoolbar);
dock = get_dock_nth (etoolbar, tpos);
@@ -1546,6 +1577,7 @@ set_edit_mode (EggEditableToolbar *etoolbar,
item = gtk_toolbar_get_nth_item (GTK_TOOLBAR (toolbar), l);
configure_item_cursor (item, etoolbar);
+ configure_item_window_drag (item, etoolbar);
configure_item_sensitivity (item, etoolbar);
}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]