gre-ilya/fltk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix for STR#3016: Fl_Input and Fl_Text_Editor have now the standard behavior when doing

Browse Source 
drag-n-drop of text: if the dragged text is dropped in the widget it comes from, it's cut and pasted.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10031 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Manolo Gouy 2013-12-13 16:28:38 +00:00
parent f7e88141c3
commit 34c69d3922
2 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/Fl_Input.cxx
View File

@ -588,7 +588,7 @@ int Fl_Input::handle_key() {
int Fl_Input::handle(int event) {
static int dnd_save_position, dnd_save_mark, drag_start = -1, newpos;
static Fl_Widget *dnd_save_focus;
static Fl_Widget *dnd_save_focus = NULL;
switch (event) {
#ifdef __APPLE__
case FL_UNFOCUS:
@ -676,6 +676,7 @@ int Fl_Input::handle(int event) {
// save the position because sometimes we don't get DND_ENTER:
dnd_save_position = position();
dnd_save_mark = mark();
dnd_save_focus = this;
// drag the data:
copy(0); Fl::dnd();
return 1;
@ -707,10 +708,10 @@ int Fl_Input::handle(int event) {
case FL_DND_ENTER:
Fl::belowmouse(this); // send the leave events first
dnd_save_position = position();
dnd_save_mark = mark();
dnd_save_focus = Fl::focus();
if (dnd_save_focus != this) {
dnd_save_position = position();
dnd_save_mark = mark();
dnd_save_focus = Fl::focus();
Fl::focus(this);
handle(FL_FOCUS);
}
@ -736,16 +737,33 @@ int Fl_Input::handle(int event) {
#if DND_OUT_XXXX
if (!focused())
#endif
if (dnd_save_focus != this) {
if (dnd_save_focus && dnd_save_focus != this) {
Fl::focus(dnd_save_focus);
handle(FL_UNFOCUS);
}
#if !(defined(__APPLE__) || defined(WIN32))
Fl::first_window()->cursor(FL_CURSOR_MOVE);
#endif
dnd_save_focus = NULL;
return 1;
case FL_DND_RELEASE:
if (dnd_save_focus == this) { // if the dragged text comes from the same widget
// remove the selected text
int old_position = position();
if (dnd_save_mark > dnd_save_position) {
int tmp = dnd_save_mark;
dnd_save_mark = dnd_save_position;
dnd_save_position = tmp;
}
replace(dnd_save_mark, dnd_save_position, NULL, 0);
if (old_position > dnd_save_position) position(old_position - (dnd_save_position - dnd_save_mark));
else position(old_position);
}
else if(dnd_save_focus) {
dnd_save_focus->handle(FL_UNFOCUS);
}
dnd_save_focus = NULL;
take_focus();
return 1;

2
src/Fl_Text_Editor.cxx
View File

@ -646,7 +646,7 @@ int Fl_Text_Editor::handle(int event) {
insert_position(dndCursorPos);
return 1;
case FL_DND_RELEASE: // keep insertion cursor and wait for the FL_PASTE event
buffer()->unselect(); // FL_PASTE must not destroy current selection!
if (!dragging) buffer()->unselect(); // FL_PASTE must not destroy current selection if drag comes from outside
return 1;
}