anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-26 11:16:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Forget to set selection in r17213

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17222 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Bo Peng 2007-02-16 15:38:34 +00:00
parent 85e92379ef
commit 204f783bb1
1 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/insets/insettabular.C
View File

@ -537,8 +537,13 @@ void InsetTabular::doDispatch(LCursor & cur, FuncRequest & cmd)
case LFUN_MOUSE_RELEASE: case LFUN_MOUSE_RELEASE:
//lyxerr << "# InsetTabular::MouseRelease\n" << bvcur << endl; //lyxerr << "# InsetTabular::MouseRelease\n" << bvcur << endl;
if (cmd.button() == mouse_button::button1) { if (cmd.button() == mouse_button::button1) {
if (bvcur.selection() && !tablemode(bvcur)) if (bvcur.selection()) {
saveSelection(bvcur); // Bug3238: disable persistent selection for table cells for now
if (tablemode(bvcur))
theSelection().haveSelection(true);
else
saveSelection(bvcur);
}
} else if (cmd.button() == mouse_button::button3) } else if (cmd.button() == mouse_button::button3)
InsetTabularMailer(*this).showDialog(&cur.bv()); InsetTabularMailer(*this).showDialog(&cur.bv());
break; break;
@ -597,8 +602,13 @@ void InsetTabular::doDispatch(LCursor & cur, FuncRequest & cmd)
TextMetrics const & tm = TextMetrics const & tm =
cur.bv().textMetrics(cell(cur.idx())->getText(0)); cur.bv().textMetrics(cell(cur.idx())->getText(0));
cur.pos() = tm.x2pos(cur.pit(), 0, cur.targetX()); cur.pos() = tm.x2pos(cur.pit(), 0, cur.targetX());
if (cmd.action == LFUN_DOWN_SELECT && !tablemode(cur)) if (cmd.action == LFUN_DOWN_SELECT) {
saveSelection(cur); // Bug3238: disable persistent selection for table cells for now
if (tablemode(cur))
theSelection().haveSelection(true);
else
saveSelection(cur);
}
} }
if (sl == cur.top()) { if (sl == cur.top()) {
// we trick it to go to the RIGHT after leaving the // we trick it to go to the RIGHT after leaving the
@ -624,8 +634,13 @@ void InsetTabular::doDispatch(LCursor & cur, FuncRequest & cmd)
ParagraphMetrics const & pm = ParagraphMetrics const & pm =
tm.parMetrics(cur.lastpit()); tm.parMetrics(cur.lastpit());
cur.pos() = tm.x2pos(cur.pit(), pm.rows().size()-1, cur.targetX()); cur.pos() = tm.x2pos(cur.pit(), pm.rows().size()-1, cur.targetX());
if (cmd.action == LFUN_UP_SELECT && !tablemode(cur)) if (cmd.action == LFUN_UP_SELECT) {
saveSelection(cur); // Bug3238: disable persistent selection for table cells for now
if (tablemode(cur))
theSelection().haveSelection(true);
else
saveSelection(cur);
}
} }
if (sl == cur.top()) { if (sl == cur.top()) {
cmd = FuncRequest(LFUN_FINISHED_UP); cmd = FuncRequest(LFUN_FINISHED_UP);