diff options
| -rw-r--r-- | cut-n-paste/toolbar-editor/egg-editable-toolbar.c | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/cut-n-paste/toolbar-editor/egg-editable-toolbar.c b/cut-n-paste/toolbar-editor/egg-editable-toolbar.c index 9193120a..e7c42b3e 100644 --- a/cut-n-paste/toolbar-editor/egg-editable-toolbar.c +++ b/cut-n-paste/toolbar-editor/egg-editable-toolbar.c @@ -372,6 +372,20 @@ popup_context_menu_cb (GtkWidget *toolbar, } } +#if GTK_CHECK_VERSION (3, 0, 0) +static gboolean +edit_mode_button_press_event_cb (GtkWidget *widget, + GdkEventButton *event, + EggEditableToolbar *etoolbar) +{ + if (event->button == 1) + { + return TRUE; + } + return FALSE; +} +#endif + static gboolean button_press_event_cb (GtkWidget *widget, GdkEventButton *event, @@ -418,6 +432,24 @@ configure_item_sensitivity (GtkToolItem *item, EggEditableToolbar *etoolbar) } +#if GTK_CHECK_VERSION (3, 0, 0) +static void toolbar_disable_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); + } +} +#endif + static void configure_item_cursor (GtkToolItem *item, EggEditableToolbar *etoolbar) @@ -1184,6 +1216,9 @@ item_added_cb (EggToolbarsModel *model, connect_widget_signals (GTK_WIDGET (item), etoolbar); configure_item_tooltip (item); configure_item_cursor (item, etoolbar); +#if GTK_CHECK_VERSION (3, 0, 0) + toolbar_disable_window_drag (item, etoolbar); +#endif configure_item_sensitivity (item, etoolbar); dock = get_dock_nth (etoolbar, tpos); @@ -1504,6 +1539,9 @@ set_edit_mode (EggEditableToolbar *etoolbar, item = gtk_toolbar_get_nth_item (GTK_TOOLBAR (toolbar), l); configure_item_cursor (item, etoolbar); +#if GTK_CHECK_VERSION (3, 0, 0) + toolbar_disable_window_drag (item, etoolbar); +#endif configure_item_sensitivity (item, etoolbar); } } |