anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-09-20 06:49:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

* Call metrics of the parameters with the correct font in MathMacros, for example

Browse Source 
if they are in an index and should be drawn smaller.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26927 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Stefan Schimanski 2008-10-16 21:27:43 +00:00
parent 1e953e486d
commit af9206b392
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/mathed/MathMacro.cpp
View File

@ -60,13 +60,12 @@ public:
///
void metrics(MetricsInfo & mi, Dimension & dim) const {
mathMacro_.macro()->unlock();
if (!mathMacro_.editMetrics(mi.base.bv)
mathMacro_.cell(idx_).metrics(mi, dim);
if (!mathMacro_.editMetrics(mi.base.bv)
&& mathMacro_.cell(idx_).empty())
def_.metrics(mi, dim);
else {
CoordCache & coords = mi.base.bv->coordCache();
dim = coords.arrays().dim(&mathMacro_.cell(idx_));
}
mathMacro_.macro()->lock();
}
///
@ -236,13 +235,18 @@ void MathMacro::metrics(MetricsInfo & mi, Dimension & dim) const
} else {
LASSERT(macro_ != 0, /**/);
// metrics are computed here for the cells,
// in the proxy we will then use the dim from the cache
InsetMathNest::metrics(mi);
// calculate metrics finally
// calculate metrics, hoping that all cells are seen
macro_->lock();
expanded_.cell(0).metrics(mi, dim);
// otherwise do a manual metrics call
CoordCache & coords = mi.base.bv->coordCache();
for (idx_type i = 0; i < nargs(); ++i) {
if (!coords.arrays().has(&cell(i))) {
Dimension tdim;
cell(i).metrics(mi, tdim);
}
}
macro_->unlock();
// calculate dimension with label while editing