anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-09-21 15:18:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

* handle the multiple-selected-cells case also for color changes in mathed

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23682 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Stefan Schimanski 2008-03-12 14:04:25 +00:00
parent 5e2aeffc43
commit 2f67f8c2b3
2 changed files with 69 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/mathed/InsetMathNest.cpp
View File

@ -416,7 +416,13 @@ void InsetMathNest::handleFont(Cursor & cur, docstring const & arg, docstring co
if (cur.inset().asInsetMath()->name() == font) { if (cur.inset().asInsetMath()->name() == font) {
cur.recordUndoInset(); cur.recordUndoInset();
cur.handleFont(to_utf8(font)); cur.handleFont(to_utf8(font));
} else { } else
handleNest(cur, createInsetMath(font), arg);
}
void InsetMathNest::handleNest(Cursor & cur, MathAtom const & nest, docstring const & arg)
{
CursorSlice i1 = cur.selBegin(); CursorSlice i1 = cur.selBegin();
CursorSlice i2 = cur.selEnd(); CursorSlice i2 = cur.selEnd();
if (!i1.inset().asInsetMath()) if (!i1.inset().asInsetMath())
@ -424,7 +430,7 @@ void InsetMathNest::handleFont(Cursor & cur, docstring const & arg, docstring co
if (i1.idx() == i2.idx()) { if (i1.idx() == i2.idx()) {
// the easy case where only one cell is selected // the easy case where only one cell is selected
cur.recordUndo(); cur.recordUndo();
cur.handleNest(createInsetMath(font)); cur.handleNest(nest);
cur.insert(arg); cur.insert(arg);
return; return;
} }
@ -441,7 +447,7 @@ void InsetMathNest::handleFont(Cursor & cur, docstring const & arg, docstring co
cur.setSelection(); cur.setSelection();
// change font of cell // change font of cell
cur.handleNest(createInsetMath(font)); cur.handleNest(nest);
cur.insert(arg); cur.insert(arg);
// cur is in the font inset now. If the loop continues, // cur is in the font inset now. If the loop continues,
@ -466,8 +472,8 @@ void InsetMathNest::handleFont(Cursor & cur, docstring const & arg, docstring co
cur.pos() = cur.lastpos(); cur.pos() = cur.lastpos();
cur.setSelection(); cur.setSelection();
// change font of cell //
cur.handleNest(createInsetMath(font)); cur.handleNest(nest);
cur.insert(arg); cur.insert(arg);
// cur is in the font inset now. If the loop continues, // cur is in the font inset now. If the loop continues,
@ -476,7 +482,6 @@ void InsetMathNest::handleFont(Cursor & cur, docstring const & arg, docstring co
cur.pop_back(); cur.pop_back();
} }
} }
}
} }
@ -486,10 +491,8 @@ void InsetMathNest::handleFont2(Cursor & cur, docstring const & arg)
Font font; Font font;
bool b; bool b;
font.fromString(to_utf8(arg), b); font.fromString(to_utf8(arg), b);
if (font.fontInfo().color() != Color_ignore) { if (font.fontInfo().color() != Color_ignore)
MathAtom at = MathAtom(new InsetMathColor(true, font.fontInfo().color())); handleNest(cur, MathAtom(new InsetMathColor(true, font.fontInfo().color())));
cur.handleNest(at, 0);
}
// FIXME: support other font changes here as well? // FIXME: support other font changes here as well?
} }

5
src/mathed/InsetMathNest.h
View File

@ -169,6 +169,11 @@ protected:
docstring const & arg, char const * const font); docstring const & arg, char const * const font);
/// ///
void handleFont2(Cursor & cur, docstring const & arg); void handleFont2(Cursor & cur, docstring const & arg);
/// Grab and erase selection and insert the InsetMathNest atom in every
/// previously selected cell, insert the grabbed former data and \c arg
/// in the first cell of the inserted atom.
void handleNest(Cursor & cur, MathAtom const & nest,
docstring const & arg = docstring());
/// interpret \p c and insert the result at the current position of /// interpret \p c and insert the result at the current position of
/// of \p cur. Return whether the cursor should stay in the formula. /// of \p cur. Return whether the cursor should stay in the formula.