mirror of
https://git.lyx.org/repos/lyx.git
synced 2025-01-11 11:08:41 +00:00
Alfredos list<> -> vector<> for RowList
Show RightAddress again git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7975 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
70f983b97f
commit
934aeb7383
@ -12,10 +12,10 @@
|
|||||||
#ifndef ROW_LIST_FWD_H
|
#ifndef ROW_LIST_FWD_H
|
||||||
#define ROW_LIST_FWD_H
|
#define ROW_LIST_FWD_H
|
||||||
|
|
||||||
#include <list>
|
#include <vector>
|
||||||
|
|
||||||
class Row;
|
class Row;
|
||||||
|
|
||||||
typedef std::list<Row> RowList;
|
typedef std::vector<Row> RowList;
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
@ -364,11 +364,11 @@ int LyXText::leftMargin(ParagraphList::iterator pit, Row const & row) const
|
|||||||
// row in this paragraph.
|
// row in this paragraph.
|
||||||
RowList::iterator rit = pit->rows.begin();
|
RowList::iterator rit = pit->rows.begin();
|
||||||
RowList::iterator end = pit->rows.end();
|
RowList::iterator end = pit->rows.end();
|
||||||
int minfill = rit->fill();
|
#warning This is wrong.
|
||||||
|
int minfill = workWidth() / 2;
|
||||||
for ( ; rit != end; ++rit)
|
for ( ; rit != end; ++rit)
|
||||||
if (rit->fill() < minfill)
|
if (rit->fill() < minfill)
|
||||||
minfill = rit->fill();
|
minfill = rit->fill();
|
||||||
|
|
||||||
x += font_metrics::signedWidth(layout->leftmargin,
|
x += font_metrics::signedWidth(layout->leftmargin,
|
||||||
tclass.defaultfont());
|
tclass.defaultfont());
|
||||||
x += minfill;
|
x += minfill;
|
||||||
|
Loading…
Reference in New Issue
Block a user