Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 235 → Rev 236

/trunk/Scribus/ChangeLogCVS
1,4 → 1,6
Changes since Version 1.1.5
18.03.2004 Fixes for rotated Tables and Borderlines.
 
17.03.2004 Printing and Exporting to PDF for Tables is now working too.
 
16.03.2004 Loading and Saving of Tables is working, including Drag&Drop.
/trunk/Scribus/scribus/mpalette.cpp
1425,7 → 1425,7
DRight->setDecimals(10);
RoundRect->setDecimals(10);
/* PFJ - 29.02.04 - Rejigged for speed */
char *point[] = {" pt", " mm", " in", " p"};
QString point[] = { tr(" pt"), tr(" mm"), tr(" in"), tr(" p")};
if (doc->Einheit > 3)
doc->Einheit = 0;
ein = point[doc->Einheit];
1948,6 → 1948,8
{
if (CurItem->isTableItem)
{
int rmo = doc->RotMode;
doc->RotMode = 0;
double dist = w - CurItem->Width;
PageItem* bb2;
PageItem* bb = CurItem;
1960,19 → 1962,20
bb2 = bb;
while (bb2->RightLink != 0)
{
doc->ActPage->MoveItem(dist, 0, bb2->RightLink, true);
doc->ActPage->MoveRotated(bb2->RightLink, FPoint(dist, 0), true);
bb2 = bb2->RightLink;
}
doc->ActPage->SizeItem(w, bb->Height, bb->ItemNr, true);
doc->ActPage->MoveSizeItem(FPoint(0, 0), FPoint(-dist, 0), bb->ItemNr, true);
bb = bb->BottomLink;
}
bb2 = bb;
while (bb2->RightLink != 0)
{
doc->ActPage->MoveItem(dist, 0, bb2->RightLink, true);
doc->ActPage->MoveRotated(bb2->RightLink, FPoint(dist, 0), true);
bb2 = bb2->RightLink;
}
doc->ActPage->SizeItem(w, bb->Height, bb->ItemNr, true);
doc->ActPage->MoveSizeItem(FPoint(0, 0), FPoint(-dist, 0), bb->ItemNr, true);
doc->RotMode = rmo;
}
else
doc->ActPage->SizeItem(w, CurItem->Height, CurItem->ItemNr, true);
2018,6 → 2021,8
{
if (CurItem->isTableItem)
{
int rmo = doc->RotMode;
doc->RotMode = 0;
double dist = h - CurItem->Height;
PageItem* bb2;
PageItem* bb = CurItem;
2030,19 → 2035,20
bb2 = bb;
while (bb2->BottomLink != 0)
{
doc->ActPage->MoveItem(0, dist, bb2->BottomLink, true);
doc->ActPage->MoveRotated(bb2->BottomLink, FPoint(0, dist), true);
bb2 = bb2->BottomLink;
}
doc->ActPage->SizeItem(bb->Width, h, bb->ItemNr, true);
doc->ActPage->MoveSizeItem(FPoint(0, 0), FPoint(0, -dist), bb->ItemNr, true);
bb = bb->RightLink;
}
bb2 = bb;
while (bb2->BottomLink != 0)
{
doc->ActPage->MoveItem(0, dist, bb2->BottomLink, true);
doc->ActPage->MoveRotated(bb2->BottomLink, FPoint(0, dist), true);
bb2 = bb2->BottomLink;
}
doc->ActPage->SizeItem(bb->Width, h, bb->ItemNr, true);
doc->ActPage->MoveSizeItem(FPoint(0, 0), FPoint(0, -dist), bb->ItemNr, true);
doc->RotMode = rmo;
}
else
doc->ActPage->SizeItem(CurItem->Width, h, CurItem->ItemNr, true);
/trunk/Scribus/scribus/page.h
103,10 → 103,10
void ResetControl();
void AdjustItemSize(PageItem *b);
bool GetItem(PageItem **b, int nr = -1);
void MoveRotated(PageItem *b, FPoint npv);
void MoveRotated(PageItem *b, FPoint npv, bool fromMP = false);
void AdjustPictScale(PageItem *b, bool reload = true);
bool SizeItem(double newX, double newY, int ite, bool fromMP = false, bool DoUpdateClip = true);
bool MoveSizeItem(FPoint newX, FPoint newY, int ite);
bool MoveSizeItem(FPoint newX, FPoint newY, int ite, bool fromMP = false);
void RotateGroup(double win);
void RotateItem(double win, int ite);
void MarkClip(PageItem *b);
/trunk/Scribus/scribus/pageitem.cpp
1542,45 → 1542,14
if (Pcolor2 != "None")
{
SetFarbe(&tmp, Pcolor2, Shade2);
if ((isTableItem) && ((TopLine) || (RightLine) || (BottomLine) || (LeftLine)))
p->setPen(tmp, Pwidth, PLineArt, Qt::SquareCap, PLineJoin);
else
p->setPen(tmp, Pwidth, PLineArt, PLineEnd, PLineJoin);
p->setPen(tmp, Pwidth, PLineArt, PLineEnd, PLineJoin);
if (DashValues.count() != 0)
p->setDash(DashValues, DashOffset);
}
else
p->setLineWidth(0);
if (isTableItem)
if (!isTableItem)
{
if ((TopLine) || (RightLine) || (BottomLine) || (LeftLine))
{
p->newPath();
if (TopLine)
{
p->moveTo(0.0, 0.0);
p->lineTo(Width, 0.0);
}
if (RightLine)
{
p->moveTo(Width, 0.0);
p->lineTo(Width, Height);
}
if (BottomLine)
{
p->moveTo(0.0, Height);
p->lineTo(Width, Height);
}
if (LeftLine)
{
p->moveTo(0.0, 0.0);
p->lineTo(0.0, Height);
}
p->drawPolyLine();
}
}
else
{
p->setupPolygon(&PoLine);
if (NamedLStyle == "")
p->drawPolyLine();
/trunk/Scribus/scribus/libabout/about.cpp
54,7 → 54,7
tabLayout1->addWidget( PixmapLabel1 );
BuildID = new QLabel( tab, "BB" );
BuildID->setAlignment(Qt::AlignCenter);
QString bu = tr("%1. %2 %3 ").arg("17").arg("March").arg("2004");
QString bu = tr("%1. %2 %3 ").arg("18").arg("March").arg("2004");
#ifdef HAVE_CMS
bu += "C";
#else
/trunk/Scribus/scribus/libprefs/prefs.cpp
1548,7 → 1548,7
QToolTip::add( TopR, tr( "Distance between the top margin guide and the edge of the page" ) );
QToolTip::add( BottomR, tr( "Distance between the bottom margin guide and the edge of the page" ) );
QToolTip::add( LeftR, tr( "Distance between the left margin guide and the edge of the page.\nIf Facing Pages is selected, this margin space can be used to achieve the correct margins for binding" ) );
QToolTip::add( RightR, tr( "Distance between the left margin guide and the edge of the page.\nIf Facing Pages is selected, this margin space can be used to achieve the correct margins for binding" ) );
QToolTip::add( RightR, tr( "Distance between the right margin guide and the edge of the page.\nIf Facing Pages is selected, this margin space can be used to achieve the correct margins for binding" ) );
QToolTip::add( ASon, tr( "When enabled, Scribus saves a backup copy of your file with the .bak extension\neach time the time period elapses" ) );
QToolTip::add( ASTime, tr( "Time period between saving automatically" ) );
 
/trunk/Scribus/scribus/page.cpp
592,10 → 592,79
Opa2 = b->OwnPage;
b->Parent = this;
b->OwnPage = this;
b->DrawObj(painter, rd);
QPainter p;
p.begin(this);
Transform(b, &p);
QRegion apr = QRegion(p.xForm(b->Clip));
QRegion apr2 = QRegion(p.xForm(QRect(-1, -1, static_cast<int>(b->Width),
static_cast<int>(b->Height))));
p.end();
if ((rd.intersects(apr.boundingRect())) || (rd.intersects(apr2.boundingRect())))
b->DrawObj(painter, rd);
b->Parent = Opa;
b->OwnPage = Opa2;
}
for (a = 0; a < Mp->Items.count(); ++a)
{
b = Mp->Items.at(a);
if (b->LayerNr != ll.LNr)
continue;
if (!b->isTableItem)
continue;
Opa = b->Parent;
Opa2 = b->OwnPage;
b->Parent = this;
b->OwnPage = this;
QPainter p;
p.begin(this);
Transform(b, &p);
QRegion apr = QRegion(p.xForm(b->Clip));
QRegion apr2 = QRegion(p.xForm(QRect(-1, -1, static_cast<int>(b->Width),
static_cast<int>(b->Height))));
p.end();
if ((rd.intersects(apr.boundingRect())) || (rd.intersects(apr2.boundingRect())))
{
painter->setZoomFactor(doku->Scale);
painter->save();
painter->translate(-rd.x(), -rd.y());
painter->translate(b->Xpos*doku->Scale, b->Ypos*doku->Scale);
painter->rotate(b->Rot);
if (b->Pcolor2 != "None")
{
QColor tmp;
b->SetFarbe(&tmp, b->Pcolor2, b->Shade2);
if ((b->TopLine) || (b->RightLine) || (b->BottomLine) || (b->LeftLine))
{
painter->setPen(tmp, b->Pwidth, b->PLineArt, Qt::SquareCap, b->PLineJoin);
painter->newPath();
if (b->TopLine)
{
painter->moveTo(0.0, 0.0);
painter->lineTo(b->Width, 0.0);
}
if (b->RightLine)
{
painter->moveTo(b->Width, 0.0);
painter->lineTo(b->Width, b->Height);
}
if (b->BottomLine)
{
painter->moveTo(0.0, b->Height);
painter->lineTo(b->Width, b->Height);
}
if (b->LeftLine)
{
painter->moveTo(0.0, 0.0);
painter->lineTo(0.0, b->Height);
}
painter->drawPolyLine();
}
}
painter->restore();
}
b->Parent = Opa;
b->OwnPage = Opa2;
}
}
Lnr++;
}
629,6 → 698,61
slotDoCurs(true);
}
}
for (a = 0; a < Items.count(); ++a)
{
b = Items.at(a);
if (b->LayerNr != ll.LNr)
continue;
if (!b->isTableItem)
continue;
QPainter p;
p.begin(this);
Transform(b, &p);
QRegion apr = QRegion(p.xForm(b->Clip));
QRegion apr2 = QRegion(p.xForm(QRect(-1, -1, static_cast<int>(b->Width),
static_cast<int>(b->Height))));
p.end();
if ((rd.intersects(apr.boundingRect())) || (rd.intersects(apr2.boundingRect())))
{
painter->setZoomFactor(doku->Scale);
painter->save();
painter->translate(-rd.x(), -rd.y());
painter->translate(b->Xpos*doku->Scale, b->Ypos*doku->Scale);
painter->rotate(b->Rot);
if (b->Pcolor2 != "None")
{
QColor tmp;
b->SetFarbe(&tmp, b->Pcolor2, b->Shade2);
if ((b->TopLine) || (b->RightLine) || (b->BottomLine) || (b->LeftLine))
{
painter->setPen(tmp, b->Pwidth, b->PLineArt, Qt::SquareCap, b->PLineJoin);
painter->newPath();
if (b->TopLine)
{
painter->moveTo(0.0, 0.0);
painter->lineTo(b->Width, 0.0);
}
if (b->RightLine)
{
painter->moveTo(b->Width, 0.0);
painter->lineTo(b->Width, b->Height);
}
if (b->BottomLine)
{
painter->moveTo(0.0, b->Height);
painter->lineTo(b->Width, b->Height);
}
if (b->LeftLine)
{
painter->moveTo(0.0, 0.0);
painter->lineTo(0.0, b->Height);
}
painter->drawPolyLine();
}
}
painter->restore();
}
}
}
Lnr++;
}
1035,7 → 1159,7
emit SetLocalValues(b->LocalScX, b->LocalScY, b->LocalX, b->LocalY );
}
 
bool Page::MoveSizeItem(FPoint newX, FPoint newY, int ite)
bool Page::MoveSizeItem(FPoint newX, FPoint newY, int ite, bool fromMP)
{
QRegion alt;
QPainter p;
1051,7 → 1175,7
ma.rotate(b->Rot);
double mx = ma.m11() * b->Width + ma.m21() * b->Height + ma.dx();
double my = ma.m22() * b->Height + ma.m12() * b->Width + ma.dy();
MoveItem(newX.x(), newX.y(), b);
MoveItem(newX.x(), newX.y(), b, fromMP);
b->Rot = xy2Deg(mx - b->Xpos, my - b->Ypos);
b->Width = sqrt(pow(mx - b->Xpos,2)+pow(my - b->Ypos,2));
b->Height = 0;
1063,6 → 1187,8
}
else
{
b->OldB2 = b->Width;
b->OldH2 = b->Height;
if (b->Rot != 0)
{
FPoint npv = FPoint(newX.x(), newX.y());
1071,13 → 1197,13
ma3.rotate(b->Rot);
double mxc3 = b->Xpos - (ma3.m11() * npv.x() + ma3.m21() * npv.y() + ma3.dx());
double myc3 = b->Ypos - (ma3.m22() * npv.y() + ma3.m12() * npv.x() + ma3.dy());
SizeItem(b->Width - newY.x(), b->Height - newY.y(), ite);
MoveItem(-mxc3, -myc3, b);
SizeItem(b->Width - newY.x(), b->Height - newY.y(), ite, fromMP);
MoveItem(-mxc3, -myc3, b, fromMP);
}
else
{
SizeItem(b->Width - newY.x(), b->Height - newY.y(), ite);
MoveItem(newX.x(), newX.y(), b);
SizeItem(b->Width - newY.x(), b->Height - newY.y(), ite, fromMP);
MoveItem(newX.x(), newX.y(), b, fromMP);
}
}
return true;
1538,7 → 1664,7
return false;
}
 
void Page::MoveRotated(PageItem *b, FPoint npv)
void Page::MoveRotated(PageItem *b, FPoint npv, bool fromMP)
{
QWMatrix ma;
ma.translate(b->Xpos, b->Ypos);
1545,7 → 1671,7
ma.rotate(b->Rot);
double mxc = b->Xpos - (ma.m11() * npv.x() + ma.m21() * npv.y() + ma.dx());
double myc = b->Ypos - (ma.m22() * npv.y() + ma.m12() * npv.x() + ma.dy());
MoveItem(-mxc, -myc, b);
MoveItem(-mxc, -myc, b, fromMP);
}
 
void Page::AdjustItemSize(PageItem *b)
2676,19 → 2802,21
bb2 = bb;
while (bb2->BottomLink != 0)
{
MoveItem(0, dist, bb2->BottomLink, false);
MoveRotated(bb2->BottomLink, FPoint(0, dist));
bb2 = bb2->BottomLink;
}
SizeItem(bb->Width, npx.y(), bb->ItemNr);
if (bb != b)
MoveSizeItem(FPoint(0, 0), FPoint(0, -dist), bb->ItemNr);
bb = bb->RightLink;
}
bb2 = bb;
while (bb2->BottomLink != 0)
{
MoveItem(0, dist, bb2->BottomLink, false);
MoveRotated(bb2->BottomLink, FPoint(0, dist));
bb2 = bb2->BottomLink;
}
SizeItem(bb->Width, npx.y(), bb->ItemNr);
if (bb != b)
MoveSizeItem(FPoint(0, 0), FPoint(0, -dist), bb->ItemNr);
bb = b;
if (b->TopLink != 0)
dist = npx.x() - b->TopLink->Width;
2705,19 → 2833,21
bb2 = bb;
while (bb2->RightLink != 0)
{
MoveItem(dist, 0, bb2->RightLink, false);
MoveRotated(bb2->RightLink, FPoint(dist, 0));
bb2 = bb2->RightLink;
}
SizeItem(npx.x(), bb->Height, bb->ItemNr);
if (bb != b)
MoveSizeItem(FPoint(0, 0), FPoint(-dist, 0), bb->ItemNr);
bb = bb->BottomLink;
}
bb2 = bb;
while (bb2->RightLink != 0)
{
MoveItem(dist, 0, bb2->RightLink, false);
MoveRotated(bb2->RightLink, FPoint(dist, 0));
bb2 = bb2->RightLink;
}
SizeItem(npx.x(), bb->Height, bb->ItemNr);
if (bb != b)
MoveSizeItem(FPoint(0, 0), FPoint(-dist, 0), bb->ItemNr);
}
if (b->flippedH % 2 != 0)
MoveItemI(-(b->Width - b->OldB2)/b->LocalScX, 0, b->ItemNr);
2763,7 → 2893,7
bb2 = bb;
while (bb2->LeftLink != 0)
{
MoveItem(npx.x(), 0, bb2->LeftLink, false);
MoveRotated(bb2->LeftLink, FPoint(npx.x(), 0));
bb2 = bb2->LeftLink;
}
MoveSizeItem(FPoint(npx.x(), 0), FPoint(npx.x(), 0), bb->ItemNr);
2772,7 → 2902,7
bb2 = bb;
while (bb2->LeftLink != 0)
{
MoveItem(npx.x(), 0, bb2->LeftLink, false);
MoveRotated(bb2->LeftLink, FPoint(npx.x(), 0));
bb2 = bb2->LeftLink;
}
MoveSizeItem(FPoint(npx.x(), 0), FPoint(npx.x(), 0), bb->ItemNr);
2786,7 → 2916,7
bb2 = bb;
while (bb2->TopLink != 0)
{
MoveItem(0, npx.y(), bb2->TopLink, false);
MoveRotated(bb2->TopLink, FPoint(0, npx.y()));
bb2 = bb2->TopLink;
}
MoveSizeItem(FPoint(0, npx.y()), FPoint(0, npx.y()), bb->ItemNr);
2795,7 → 2925,7
bb2 = bb;
while (bb2->TopLink != 0)
{
MoveItem(0, npx.y(), bb2->TopLink, false);
MoveRotated(bb2->TopLink, FPoint(0, npx.y()));
bb2 = bb2->TopLink;
}
MoveSizeItem(FPoint(0, npx.y()), FPoint(0, npx.y()), bb->ItemNr);
2852,19 → 2982,19
bb2 = bb;
while (bb2->RightLink != 0)
{
MoveItem(dist, 0, bb2->RightLink, false);
MoveRotated(bb2->RightLink, FPoint(dist, 0));
bb2 = bb2->RightLink;
}
SizeItem(npx.x(), bb->Height, bb->ItemNr);
MoveSizeItem(FPoint(0, 0), FPoint(-dist, 0), bb->ItemNr);
bb = bb->BottomLink;
}
bb2 = bb;
while (bb2->RightLink != 0)
{
MoveItem(dist, 0, bb2->RightLink, false);
MoveRotated(bb2->RightLink, FPoint(dist, 0));
bb2 = bb2->RightLink;
}
SizeItem(npx.x(), bb->Height, bb->ItemNr);
MoveSizeItem(FPoint(0, 0), FPoint(-dist, 0), bb->ItemNr);
bb = b;
while (bb->LeftLink != 0)
{
2875,7 → 3005,7
bb2 = bb;
while (bb2->TopLink != 0)
{
MoveItem(0, npx.y(), bb2->TopLink, false);
MoveRotated(bb2->TopLink, FPoint(0, npx.y()));
bb2 = bb2->TopLink;
}
MoveSizeItem(FPoint(0, npx.y()), FPoint(0, npx.y()), bb->ItemNr);
2884,7 → 3014,7
bb2 = bb;
while (bb2->TopLink != 0)
{
MoveItem(0, npx.y(), bb2->TopLink, false);
MoveRotated(bb2->TopLink, FPoint(0, npx.y()));
bb2 = bb2->TopLink;
}
MoveSizeItem(FPoint(0, npx.y()), FPoint(0, npx.y()), bb->ItemNr);
2912,19 → 3042,19
bb2 = bb;
while (bb2->BottomLink != 0)
{
MoveItem(0, dist, bb2->BottomLink, false);
MoveRotated(bb2->BottomLink, FPoint(0, dist));
bb2 = bb2->BottomLink;
}
SizeItem(bb->Width, npx.y(), bb->ItemNr);
MoveSizeItem(FPoint(0, 0), FPoint(0, -dist), bb->ItemNr);
bb = bb->RightLink;
}
bb2 = bb;
while (bb2->BottomLink != 0)
{
MoveItem(0, dist, bb2->BottomLink, false);
MoveRotated(bb2->BottomLink, FPoint(0, dist));
bb2 = bb2->BottomLink;
}
SizeItem(bb->Width, npx.y(), bb->ItemNr);
MoveSizeItem(FPoint(0, 0), FPoint(0, -dist), bb->ItemNr);
bb = b;
while (bb->TopLink != 0)
{
2935,7 → 3065,7
bb2 = bb;
while (bb2->LeftLink != 0)
{
MoveItem(npx.x(), 0, bb2->LeftLink, false);
MoveRotated(bb2->LeftLink, FPoint(npx.x(), 0));
bb2 = bb2->LeftLink;
}
MoveSizeItem(FPoint(npx.x(), 0), FPoint(npx.x(), 0), bb->ItemNr);
2944,7 → 3074,7
bb2 = bb;
while (bb2->LeftLink != 0)
{
MoveItem(npx.x(), 0, bb2->LeftLink, false);
MoveRotated(bb2->LeftLink, FPoint(npx.x(), 0));
bb2 = bb2->LeftLink;
}
MoveSizeItem(FPoint(npx.x(), 0), FPoint(npx.x(), 0), bb->ItemNr);
2958,6 → 3088,7
MoveItemI(0, -(b->Height - b->OldH2)/b->LocalScY, b->ItemNr);
break;
case 5:
b->Sizing = false;
if (b->isTableItem)
{
double dist = npx.y() - b->Height;
2972,23 → 3103,22
bb2 = bb;
while (bb2->BottomLink != 0)
{
MoveItem(0, dist, bb2->BottomLink, false);
MoveRotated(bb2->BottomLink, FPoint(0, dist));
bb2 = bb2->BottomLink;
}
SizeItem(bb->Width, npx.y(), bb->ItemNr);
MoveSizeItem(FPoint(0, 0), FPoint(0, -dist), bb->ItemNr);
bb = bb->RightLink;
}
bb2 = bb;
while (bb2->BottomLink != 0)
{
MoveItem(0, dist, bb2->BottomLink, false);
MoveRotated(bb2->BottomLink, FPoint(0, dist));
bb2 = bb2->BottomLink;
}
SizeItem(bb->Width, npx.y(), bb->ItemNr);
MoveSizeItem(FPoint(0, 0), FPoint(0, -dist), bb->ItemNr);
}
else
MoveSizeItem(FPoint(0, 0), FPoint(0, b->Height - npx.y()), b->ItemNr);
b->Sizing = false;
if (b->flippedV % 2 != 0)
MoveItemI(0, -(b->Height - b->OldH2)/b->LocalScY, b->ItemNr);
break;
3008,19 → 3138,19
bb2 = bb;
while (bb2->RightLink != 0)
{
MoveItem(dist, 0, bb2->RightLink, false);
MoveRotated(bb2->RightLink, FPoint(dist, 0));
bb2 = bb2->RightLink;
}
SizeItem(npx.x(), bb->Height, bb->ItemNr);
MoveSizeItem(FPoint(0, 0), FPoint(-dist, 0), bb->ItemNr);
bb = bb->BottomLink;
}
bb2 = bb;
while (bb2->RightLink != 0)
{
MoveItem(dist, 0, bb2->RightLink, false);
MoveRotated(bb2->RightLink, FPoint(dist, 0));
bb2 = bb2->RightLink;
}
SizeItem(npx.x(), bb->Height, bb->ItemNr);
MoveSizeItem(FPoint(0, 0), FPoint(-dist, 0), bb->ItemNr);
}
else
MoveSizeItem(FPoint(0, 0), FPoint(b->Width - npx.x(), 0), b->ItemNr);
3041,7 → 3171,7
bb2 = bb;
while (bb2->LeftLink != 0)
{
MoveItem(npx.x(), 0, bb2->LeftLink, false);
MoveRotated(bb2->LeftLink, FPoint(npx.x(), 0));
bb2 = bb2->LeftLink;
}
MoveSizeItem(FPoint(npx.x(), 0), FPoint(npx.x(), 0), bb->ItemNr);
3050,7 → 3180,7
bb2 = bb;
while (bb2->LeftLink != 0)
{
MoveItem(npx.x(), 0, bb2->LeftLink, false);
MoveRotated(bb2->LeftLink, FPoint(npx.x(), 0));
bb2 = bb2->LeftLink;
}
MoveSizeItem(FPoint(npx.x(), 0), FPoint(npx.x(), 0), bb->ItemNr);
3077,7 → 3207,7
bb2 = bb;
while (bb2->TopLink != 0)
{
MoveItem(0, npx.y(), bb2->TopLink, false);
MoveRotated(bb2->TopLink, FPoint(0, npx.y()));
bb2 = bb2->TopLink;
}
MoveSizeItem(FPoint(0, npx.y()), FPoint(0, npx.y()), bb->ItemNr);
3086,7 → 3216,7
bb2 = bb;
while (bb2->TopLink != 0)
{
MoveItem(0, npx.y(), bb2->TopLink, false);
MoveRotated(bb2->TopLink, FPoint(0, npx.y()));
bb2 = bb2->TopLink;
}
MoveSizeItem(FPoint(0, npx.y()), FPoint(0, npx.y()), bb->ItemNr);