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

* fix broken default value logic from last cleanup: only show default value if not in edit mode and the given value is empty.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22413 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Stefan Schimanski 2008-01-07 13:50:21 +00:00
parent cdb78de525
commit 102638a478
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/mathed/MathMacro.cpp
View File

@ -52,7 +52,8 @@ 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_.editMetrics(mi.base.bv) && !def_.empty()) if (!mathMacro_.editMetrics(mi.base.bv)
&& mathMacro_.cell(idx_).empty())
def_.metrics(mi, dim); def_.metrics(mi, dim);
mathMacro_.macro()->lock(); mathMacro_.macro()->lock();
} }
@ -70,21 +71,19 @@ public:
pi.pain.leaveMonochromeMode(); pi.pain.leaveMonochromeMode();
mathMacro_.cell(idx_).draw(pi, x, y); mathMacro_.cell(idx_).draw(pi, x, y);
pi.pain.enterMonochromeMode(Color_mathbg, Color_mathmacroblend); pi.pain.enterMonochromeMode(Color_mathbg, Color_mathmacroblend);
} else { } else if (mathMacro_.cell(idx_).empty()) {
if (def_.empty())
mathMacro_.cell(idx_).draw(pi, x, y);
else {
mathMacro_.cell(idx_).setXY(*pi.base.bv, x, y); mathMacro_.cell(idx_).setXY(*pi.base.bv, x, y);
def_.draw(pi, x, y); def_.draw(pi, x, y);
} } else
} mathMacro_.cell(idx_).draw(pi, x, y);
} }
/// ///
size_t idx() const { return idx_; } size_t idx() const { return idx_; }
/// ///
int kerning(BufferView const * bv) const int kerning(BufferView const * bv) const
{ {
if (mathMacro_.editMetrics(bv) || def_.empty()) if (mathMacro_.editMetrics(bv)
|| !mathMacro_.cell(idx_).empty())
return mathMacro_.cell(idx_).kerning(bv); return mathMacro_.cell(idx_).kerning(bv);
else else
return def_.kerning(bv); return def_.kerning(bv);