Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 4585 → Rev 4586

/branches/Version13x/Scribus/scribus/pageitem_textframe.cpp
806,6 → 806,7
double TopOffset = asce;
double BotOffset = desc2;
goNoRoom = false;
bool specialCase = false;
if (StartOfCol)
{
CurY = asce+TExtra+lineCorr+1;
823,6 → 824,13
}
if (CurY-TopOffset < 0.0)
CurY = TopOffset+1;
pt1 = QPoint(static_cast<int>(ceil(CurX-Extra)), static_cast<int>(CurY+BotOffset));
pt2 = QPoint(static_cast<int>(ceil(CurX-Extra)), static_cast<int>(ceil(CurY-TopOffset)));
if ((!cl.contains(pf2.xForm(pt1))) || (!cl.contains(pf2.xForm(pt2))))
{
specialCase = true;
CurX -= Extra;
}
pt1 = QPoint(static_cast<int>(ceil(CurX)), static_cast<int>(CurY+BotOffset));
pt2 = QPoint(static_cast<int>(ceil(CurX)), static_cast<int>(ceil(CurY-TopOffset)));
while ((!cl.contains(pf2.xForm(pt1))) || (!cl.contains(pf2.xForm(pt2))))
899,7 → 907,7
pt1 = QPoint(static_cast<int>(ceil(CurX)), static_cast<int>(CurY+BotOffset));
pt2 = QPoint(static_cast<int>(ceil(CurX)), static_cast<int>(ceil(CurY-TopOffset)));
}
if ((fBorder) && (!AbsHasDrop))
if (((fBorder) || (specialCase)) && (!AbsHasDrop))
CurX += Extra;
if (a > 0)
{