Skip to content
Permalink
Browse files

pluma-notebook: Fix: unexpected behavior with dnd selected text

Fixes #329
  • Loading branch information...
sc0w authored and vkareh committed May 27, 2018
1 parent 12e55b6 commit f6f9fdc477f1fe5565563db877713e06a94bde74
Showing with 23 additions and 1 deletion.
  1. +23 −1 pluma/pluma-notebook.c
@@ -83,6 +83,7 @@ static void move_current_tab_to_another_notebook (PlumaNotebook *src,
/* Local variables */
static GdkCursor *cursor = NULL;
static gboolean leftdown = FALSE;
static gboolean drag_ready = FALSE;

/* Signals */
enum
@@ -493,7 +494,11 @@ motion_notify_cb (PlumaNotebook *notebook,
event->x_root,
event->y_root))
{
drag_start (notebook, (GdkEvent *) event);
if (drag_ready)
drag_start (notebook, (GdkEvent *) event);
else
drag_stop (notebook);

return TRUE;
}

@@ -618,6 +623,7 @@ button_release_cb (PlumaNotebook *notebook,

/* This must be called even if a drag isn't happening */
drag_stop (notebook);
drag_ready = FALSE;

return FALSE;
}
@@ -699,6 +705,15 @@ button_press_cb (PlumaNotebook *notebook,
return FALSE;
}

static gboolean
grab_focus_cb (PlumaNotebook *notebook,
GdkEventButton *event,
gpointer data)
{
drag_ready = TRUE;
return FALSE;
}

/**
* pluma_notebook_new:
*
@@ -789,10 +804,17 @@ pluma_notebook_init (PlumaNotebook *notebook)
"button-press-event",
(GCallback)button_press_cb,
NULL);

g_signal_connect (notebook,
"button-release-event",
(GCallback)button_release_cb,
NULL);

g_signal_connect (notebook,
"grab-focus",
(GCallback)grab_focus_cb,
NULL);

gtk_widget_add_events (GTK_WIDGET (notebook),
GDK_BUTTON1_MOTION_MASK);

0 comments on commit f6f9fdc

Please sign in to comment.
You can’t perform that action at this time.