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

* make sure the edit mode is the same in math macros and argument proxy

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22292 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Stefan Schimanski 2007-12-24 10:54:39 +00:00
parent 6a9e5edae3
commit 04537d8664
2 changed files with 27 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/mathed/MathMacro.cpp
View File

@ -52,16 +52,16 @@ public:
void metrics(MetricsInfo & mi, Dimension & dim) const { void metrics(MetricsInfo & mi, Dimension & dim) const {
mathMacro_.macro()->unlock(); mathMacro_.macro()->unlock();
mathMacro_.cell(idx_).metrics(mi, dim); mathMacro_.cell(idx_).metrics(mi, dim);
if (!mathMacro_.editing(mi.base.bv) && !def_.empty()) if (!mathMacro_.editMetrics(mi.base.bv) && !def_.empty())
def_.metrics(mi, dim); def_.metrics(mi, dim);
mathMacro_.macro()->lock(); mathMacro_.macro()->lock();
} }
/// ///
void draw(PainterInfo & pi, int x, int y) const { void draw(PainterInfo & pi, int x, int y) const {
if (mathMacro_.editing(pi.base.bv)) { if (mathMacro_.editMetrics(pi.base.bv)) {
// The only way a ArgumentProxy can appear is in a cell of the // The only way a ArgumentProxy can appear is in a cell of the
// MathMacro. Moreover the cells are only drawn in the DISPLAY_FOLDED // MathMacro. Moreover the cells are only drawn in the DISPLAY_FOLDED
// mode and then, in the case of "editing_ == true" the monochrome // mode and then, if the macro is edited the monochrome
// mode is entered by the MathMacro before calling the cells' draw // mode is entered by the MathMacro before calling the cells' draw
// method. Then eventually this code is reached and the proxy leaves // method. Then eventually this code is reached and the proxy leaves
// monochrome mode temporarely. Hence, if it is not in monochrome // monochrome mode temporarely. Hence, if it is not in monochrome
@ -82,7 +82,13 @@ public:
/// ///
size_t idx() const { return idx_; } size_t idx() const { return idx_; }
/// ///
int kerning(BufferView const * bv) const { return mathMacro_.cell(idx_).kerning(bv); } int kerning(BufferView const * bv) const
{
if (mathMacro_.editMetrics(bv) || def_.empty())
return mathMacro_.cell(idx_).kerning(bv);
else
return def_.kerning(bv);
}
private: private:
/// ///
@ -141,8 +147,9 @@ int MathMacro::cursorIdx(Cursor const & cur) const {
} }
bool MathMacro::editMode(Cursor const & cur) const { bool MathMacro::editMode(BufferView const * bv) const {
// find this in cursor trace // find this in cursor trace
Cursor const & cur = bv->cursor();
for (size_t i = 0; i != cur.depth(); ++i) for (size_t i = 0; i != cur.depth(); ++i)
if (&cur[i].inset() == this) { if (&cur[i].inset() == this) {
// look if there is no other macro in edit mode above // look if there is no other macro in edit mode above
@ -161,10 +168,16 @@ bool MathMacro::editMode(Cursor const & cur) const {
} }
bool MathMacro::editMetrics(BufferView const * bv) const
{
return editing_[bv];
}
void MathMacro::metrics(MetricsInfo & mi, Dimension & dim) const void MathMacro::metrics(MetricsInfo & mi, Dimension & dim) const
{ {
// set edit mode for which we will have calculated metrics // set edit mode for which we will have calculated metrics. But only
editing_[mi.base.bv] = editMode(mi.base.bv->cursor()); editing_[mi.base.bv] = editMode(mi.base.bv);
// calculate new metrics according to display mode // calculate new metrics according to display mode
if (displayMode_ == DISPLAY_INIT || displayMode_ == DISPLAY_INTERACTIVE_INIT) { if (displayMode_ == DISPLAY_INIT || displayMode_ == DISPLAY_INTERACTIVE_INIT) {
@ -180,7 +193,7 @@ void MathMacro::metrics(MetricsInfo & mi, Dimension & dim) const
} else { } else {
BOOST_ASSERT(macro_ != 0); BOOST_ASSERT(macro_ != 0);
// calculate metric finally // calculate metrics finally
macro_->lock(); macro_->lock();
expanded_.cell(0).metrics(mi, dim); expanded_.cell(0).metrics(mi, dim);
macro_->unlock(); macro_->unlock();
@ -205,7 +218,7 @@ void MathMacro::metrics(MetricsInfo & mi, Dimension & dim) const
int MathMacro::kerning(BufferView const * bv) const { int MathMacro::kerning(BufferView const * bv) const {
if (displayMode_ == DISPLAY_NORMAL && !editing(bv)) if (displayMode_ == DISPLAY_NORMAL && !editing_[bv])
return expanded_.kerning(bv); return expanded_.kerning(bv);
else else
return 0; return 0;
@ -330,7 +343,7 @@ void MathMacro::draw(PainterInfo & pi, int x, int y) const
// another argument selected or edit mode changed? // another argument selected or edit mode changed?
idx_type curIdx = cursorIdx(pi.base.bv->cursor()); idx_type curIdx = cursorIdx(pi.base.bv->cursor());
if (previousCurIdx_[pi.base.bv] != curIdx if (previousCurIdx_[pi.base.bv] != curIdx
|| editing_[pi.base.bv] != editMode(pi.base.bv->cursor())) || editing_[pi.base.bv] != editMode(pi.base.bv))
pi.base.bv->cursor().updateFlags(Update::Force); pi.base.bv->cursor().updateFlags(Update::Force);
} }

6
src/mathed/MathMacro.h
View File

@ -140,14 +140,16 @@ protected:
void attachArguments(std::vector<MathData> const & args, size_t arity, int optionals); void attachArguments(std::vector<MathData> const & args, size_t arity, int optionals);
/// ///
MacroData const * macro() { return macro_; } MacroData const * macro() { return macro_; }
///
bool editMetrics(BufferView const * bv) const;
private: private:
/// ///
virtual Inset * clone() const; virtual Inset * clone() const;
/// the index of the cursor slice of the macro, or -1 if it is not edited /// the index of the cursor slice of the macro, or -1 if it is not edited
int cursorIdx(Cursor const & cur) const; int cursorIdx(Cursor const & cur) const;
/// ///
bool editMode(Cursor const & cur) const; bool editMode(BufferView const * bv) const;
/// name of macro /// name of macro
docstring name_; docstring name_;