summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGreg Ercolano <erco@seriss.com>2014-02-16 08:36:34 +0000
committerGreg Ercolano <erco@seriss.com>2014-02-16 08:36:34 +0000
commitb72cb186812aa0a016beb9bf345f51bdf07ee076 (patch)
tree29c45a46afb5d6fb535ad015e42ca889c6973a35
parent9302301809c51d8670f3d2960de95b2be8ec5869 (diff)
Fixes STR #3018 -- thanks kdiman for complete patch.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10104 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
-rw-r--r--src/Fl_Table.cxx4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/Fl_Table.cxx b/src/Fl_Table.cxx
index 259c82572..ef2137e42 100644
--- a/src/Fl_Table.cxx
+++ b/src/Fl_Table.cxx
@@ -808,6 +808,7 @@ int Fl_Table::handle(int event) {
ret = 1;
} else {
// Not resizing? Select the column
+ if ( Fl::focus() != this && contains(Fl::focus()) ) return 0; // STR #3018 - item 1
current_col = select_col = C;
current_row = 0;
select_row = rows() - 1;
@@ -834,6 +835,7 @@ int Fl_Table::handle(int event) {
ret = 1;
} else {
// Not resizing? Select the row
+ if ( Fl::focus() != this && contains(Fl::focus()) ) return 0; // STR #3018 - item 1
current_row = select_row = R;
current_col = 0;
select_col = cols() - 1;
@@ -899,6 +901,8 @@ int Fl_Table::handle(int event) {
if (_event_button == 1 &&
_selecting == CONTEXT_CELL &&
context == CONTEXT_CELL) {
+ // Dragging a cell selection?
+ if ( _event_clicks ) break; // STR #3018 - item 2
if (select_row != R || select_col != C) {
damage_zone(current_row, current_col, select_row, select_col, R, C);
}