The branch, 2.0.x, has been updated. - Log -----------------------------------------------------------------
commit cf7b38ee23fea2f25523910c2fe1a8c60b288da3 Author: Scott Kostyshak <[email protected]> Date: Wed Dec 12 03:44:38 2012 -0500 Fix a bug when selecting a cell in InsetTabular Fix the following bug: When in tabular, enter "ab" in a cell. Place the cursor before "b". Hold shift and press <right>, then (still holding shift) <right> again. On the second <right> nothing appears to happen. Related to #1802. (cherry picked from commit 4b706051b73ece2d806bc8b4daf430f2e0be6995) diff --git a/src/insets/InsetTabular.cpp b/src/insets/InsetTabular.cpp index c740a2f..d2ad490 100644 --- a/src/insets/InsetTabular.cpp +++ b/src/insets/InsetTabular.cpp @@ -4054,6 +4054,7 @@ void InsetTabular::doDispatch(Cursor & cur, FuncRequest & cmd) if (select_whole && !empty_cell){ getText(cur.idx())->selectAll(cur); cur.dispatched(); + cur.screenUpdateFlags(Update::Force | Update::FitCursor); break; } diff --git a/status.20x b/status.20x index dd1fabe..dd646c7 100644 --- a/status.20x +++ b/status.20x @@ -90,6 +90,8 @@ What's new - Allow arguments in PassThru environments (bug 7646). +- Fix a few selection bugs in tabular (bug 4981). + * DOCUMENTATION AND LOCALIZATION commit 80a5892049b27226b68a01d3249042f3c3eeeb3e Author: Scott Kostyshak <[email protected]> Date: Wed Dec 12 03:44:17 2012 -0500 Fix another selection bug in InsetTabular Fix #4981: In tabular if a vertical selection is made with the keyboard (e.g. LFUN_UP_SELECT), the selection is drawn if there are two cells selected. Previously, the selection would be drawn only if there were more than two selected. (cherry picked from commit 5cc1adf7c7a348aae4f9471d7edb41c8570311d7) diff --git a/src/insets/InsetTabular.cpp b/src/insets/InsetTabular.cpp index 6115f0a..c740a2f 100644 --- a/src/insets/InsetTabular.cpp +++ b/src/insets/InsetTabular.cpp @@ -4118,6 +4118,7 @@ void InsetTabular::doDispatch(Cursor & cur, FuncRequest & cmd) cur.pit() = cur.lastpit(); cur.pos() = cur.lastpos(); cur.setCurrentFont(); + cur.screenUpdateFlags(Update::Force | Update::FitCursor); return; } cur.screenUpdateFlags(Update::Force | Update::FitCursor); @@ -4156,6 +4157,7 @@ void InsetTabular::doDispatch(Cursor & cur, FuncRequest & cmd) cur.pit() = 0; cur.pos() = cur.lastpos(); cur.setCurrentFont(); + cur.screenUpdateFlags(Update::Force | Update::FitCursor); return; } cur.screenUpdateFlags(Update::Force | Update::FitCursor); commit cbaaa09c7b21b2fae15da28b801e9a906d3f0856 Author: Scott Kostyshak <[email protected]> Date: Wed Dec 12 03:43:53 2012 -0500 Fix a selection bug in InsetTabular If you have a selection across cells in tabular, moving the cursor vertically up or down (e.g. LFUN_UP) now removes the drawn selection. Before, the selection was set to false but it was not repainted. (cherry picked from commit 776e66688f65955b6baa556f83ca34e13c7484ff) diff --git a/src/insets/InsetTabular.cpp b/src/insets/InsetTabular.cpp index 768b8cf..6115f0a 100644 --- a/src/insets/InsetTabular.cpp +++ b/src/insets/InsetTabular.cpp @@ -4120,7 +4120,7 @@ void InsetTabular::doDispatch(Cursor & cur, FuncRequest & cmd) cur.setCurrentFont(); return; } - cur.screenUpdateFlags(Update::FitCursor); + cur.screenUpdateFlags(Update::Force | Update::FitCursor); break; case LFUN_UP_SELECT: @@ -4158,7 +4158,7 @@ void InsetTabular::doDispatch(Cursor & cur, FuncRequest & cmd) cur.setCurrentFont(); return; } - cur.screenUpdateFlags(Update::FitCursor); + cur.screenUpdateFlags(Update::Force | Update::FitCursor); break; // case LFUN_SCREEN_DOWN: { ----------------------------------------------------------------------- Summary of changes: src/insets/InsetTabular.cpp | 7 +++++-- status.20x | 2 ++ 2 files changed, 7 insertions(+), 2 deletions(-) hooks/post-receive -- The LyX Source Repository
