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

Remove unused 'glue' parameter

Browse Source 
It was probably useful at some time, but not now.
This commit is contained in:
Jean-Marc Lasgouttes 2016-08-30 17:20:21 +02:00
parent 78ae499355
commit da30e38400
2 changed files with 0 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/mathed/MathData.cpp
View File

@ -846,20 +846,12 @@ void MathData::collectParameters(Cursor * cur,
int MathData::pos2x(BufferView const * bv, size_type pos) const int MathData::pos2x(BufferView const * bv, size_type pos) const
{
return pos2x(bv, pos, 0);
}
int MathData::pos2x(BufferView const * bv, size_type pos, int glue) const
{ {
int x = 0; int x = 0;
size_type target = min(pos, size()); size_type target = min(pos, size());
CoordCache::Insets const & coords = bv->coordCache().getInsets(); CoordCache::Insets const & coords = bv->coordCache().getInsets();
for (size_type i = 0; i < target; ++i) { for (size_type i = 0; i < target; ++i) {
const_iterator it = begin() + i; const_iterator it = begin() + i;
if ((*it)->getChar() == ' ')
x += glue;
//lyxerr << "char: " << (*it)->getChar() //lyxerr << "char: " << (*it)->getChar()
// << "width: " << (*it)->width() << endl; // << "width: " << (*it)->width() << endl;
x += coords.dim((*it).nucleus()).wid; x += coords.dim((*it).nucleus()).wid;
@ -869,12 +861,6 @@ int MathData::pos2x(BufferView const * bv, size_type pos, int glue) const
MathData::size_type MathData::x2pos(BufferView const * bv, int targetx) const MathData::size_type MathData::x2pos(BufferView const * bv, int targetx) const
{
return x2pos(bv, targetx, 0);
}
MathData::size_type MathData::x2pos(BufferView const * bv, int targetx, int glue) const
{ {
const_iterator it = begin(); const_iterator it = begin();
int lastx = 0; int lastx = 0;
@ -883,8 +869,6 @@ MathData::size_type MathData::x2pos(BufferView const * bv, int targetx, int glue
// find first position after targetx // find first position after targetx
for (; currx < targetx && it != end(); ++it) { for (; currx < targetx && it != end(); ++it) {
lastx = currx; lastx = currx;
if ((*it)->getChar() == ' ')
currx += glue;
currx += coords.dim((*it).nucleus()).wid; currx += coords.dim((*it).nucleus()).wid;
} }

4
src/mathed/MathData.h
View File

@ -144,11 +144,7 @@ public:
/// returns x coordinate of given position in the array /// returns x coordinate of given position in the array
int pos2x(BufferView const * bv, size_type pos) const; int pos2x(BufferView const * bv, size_type pos) const;
/// returns position of given x coordinate /// returns position of given x coordinate
int pos2x(BufferView const * bv, size_type pos, int glue) const;
/// returns position of given x coordinate
size_type x2pos(BufferView const * bv, int targetx) const; size_type x2pos(BufferView const * bv, int targetx) const;
/// returns position of given x coordinate starting from a certain pos
size_type x2pos(BufferView const * bv, int targetx, int glue) const;
/// returns distance of this cell to the point given by x and y /// returns distance of this cell to the point given by x and y
// assumes valid position and size cache // assumes valid position and size cache
int dist(BufferView const & bv, int x, int y) const; int dist(BufferView const & bv, int x, int y) const;