Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 11052 → Rev 11051

/trunk/Scribus/scribus/pageitem.cpp
895,7 → 895,7
/** Paints the item.
CHANGE: cullingArea is in doc coordinates!
*/
void PageItem::DrawObj(ScPainter *p, QRectF cullingArea)
void PageItem::DrawObj(ScPainter *p, QRect cullingArea)
{
double sc;
if (!m_Doc->DoDrawing)
1185,7 → 1185,7
p->restore();
}
 
void PageItem::DrawObj_Embedded(ScPainter *p, QRectF cullingArea, const CharStyle& style, PageItem* cembedded)
void PageItem::DrawObj_Embedded(ScPainter *p, QRect cullingArea, const CharStyle& style, PageItem* cembedded)
{
if (!cembedded)
return;
1512,7 → 1512,7
painter->translate(embedded->gXpos, embedded->gYpos);
embedded->isEmbedded = true;
embedded->invalid = true;
embedded->DrawObj(painter, QRectF());
embedded->DrawObj(painter, QRect());
embedded->Xpos = x;
embedded->Ypos = y;
embedded->isEmbedded = false;
3262,7 → 3262,7
ScribusView* view = m_Doc->view();
setLayer(isUndo ? state->getInt("OLD_LAYER") : state->getInt("NEW_LAYER"));
view->Deselect(true);
m_Doc->regionsChanged()->update(QRectF());
m_Doc->regionsChanged()->update(QRect());
}
 
void PageItem::restoreGetImage(SimpleState *state, bool isUndo)
3314,7 → 3314,7
}
m_Doc->AdjustItemSize(this);
m_Doc->MoveItem(mx, my, this, false);
m_Doc->regionsChanged()->update(QRectF());
m_Doc->regionsChanged()->update(QRect());
}
 
}
/trunk/Scribus/scribus/canvas.cpp
66,7 → 66,7
m_bufferRect = QRect();
oldMinCanvasCoordinate = FPoint();
m_viewMode.init();
m_renderMode = RENDER_NORMAL;
m_renderMode = RENDER_LEGACY;
}
 
 
409,6 → 409,7
return;
 
// fill buffer if necessary
// if ((m_viewMode.firstSpecial) || ((!m_bufferRect.contains(p->rect())) || (m_doc->minCanvasCoordinate != oldMinCanvasCoordinate) && !(m_doc->appMode == modeEditClip)))
if (m_doc->minCanvasCoordinate != oldMinCanvasCoordinate)
{
clearBuffers();
488,6 → 489,76
case RENDER_LEGACY:
default:
assert (false);
QPainter bufp(&m_buffer);
bufp.translate(-m_bufferRect.x(), -m_bufferRect.y());
qDebug() << "fill Buffer2:" << m_bufferRect << p->rect();
// bufp.translate(-m_doc->minCanvasCoordinate.x() * m_viewMode.scale, -m_doc->minCanvasCoordinate.y() * m_viewMode.scale);
drawContents(&bufp,
p->rect().x() + m_doc->minCanvasCoordinate.x() * m_viewMode.scale,
p->rect().y() + m_doc->minCanvasCoordinate.y() * m_viewMode.scale,
p->rect().width(),
p->rect().height());
#if 0
if (m_viewMode.specialRendering)
{
QPainter pixmapp;
QPixmap pixmap = m_buffer; // copy
pixmapp.begin(&pixmap);
pixmapp.translate(-m_bufferRect.x(), -m_bufferRect.y());
pixmapp.setRenderHint(QPainter::Antialiasing, true);
pixmapp.translate(-m_doc->minCanvasCoordinate.x() * m_viewMode.scale, -m_doc->minCanvasCoordinate.y() * m_viewMode.scale);
drawControls(&pixmapp);
#if DRAW_DEBUG_LINES
pixmapp.setPen(Qt::red);
pixmapp.drawLine(p->rect().x(), p->rect().y(), p->rect().x() + p->rect().width(), p->rect().y() + p->rect().height());
pixmapp.drawLine(p->rect().x() + p->rect().width(), p->rect().y(), p->rect().x(), p->rect().y() + p->rect().height());
#endif
pixmapp.end();
// qp.resetMatrix();
#if DRAW_DEBUG_LINES
qDebug() << "specialRendering:" << p->rect() << "from" << m_bufferRect.x() << m_bufferRect.y();
#endif
int xV = p->rect().x() - m_bufferRect.x();
int yV = p->rect().y() - m_bufferRect.y();
int wV = p->rect().width();
int hV = p->rect().height();
if (xV < 0)
{
wV += xV;
xV = 0;
}
if (yV < 0)
{
hV += yV;
yV = 0;
}
if (hV > 0 && wV > 0)
{
qp.drawPixmap(p->rect().x(), p->rect().y(), pixmap, xV, yV, wV, hV);
}
#if DRAW_DEBUG_LINES
qDebug() << "specialRendering" << xV << yV << wV << hV << "at" << p->rect().x() << p->rect().y();
qp.setPen(Qt::green);
qp.drawLine(p->rect().x(), p->rect().y(), p->rect().x() + p->rect().width(), p->rect().y() + p->rect().height());
qp.drawLine(p->rect().x() + p->rect().width(), p->rect().y(), p->rect().x(), p->rect().y() + p->rect().height());
#endif
}
else
#endif
{
//drawContents(&qp, p->rect().x(), p->rect().y(), p->rect().width(), p->rect().height());
qp.drawPixmap(p->rect().x(), p->rect().y(), m_buffer, p->rect().x() - m_bufferRect.x(), p->rect().y() - m_bufferRect.y(), p->rect().width(), p->rect().height());
#if DRAW_DEBUG_LINES
qp.setPen(Qt::blue);
qp.drawLine(p->rect().x(), p->rect().y(), p->rect().x() + p->rect().width(), p->rect().y() + p->rect().height());
qp.drawLine(p->rect().x() + p->rect().width(), p->rect().y(), p->rect().x(), p->rect().y() + p->rect().height());
#endif
if ((m_doc->m_Selection->count() != 0) && !(m_viewMode.operItemMoving || m_viewMode.operItemResizing) && (m_doc->appMode != modeDrawBezierLine))
{
qp.translate(-m_doc->minCanvasCoordinate.x() * m_viewMode.scale, -m_doc->minCanvasCoordinate.y() * m_viewMode.scale);
drawControlsSelection(&qp, m_doc->m_Selection->itemAt(0));
}
}
}
m_view->m_canvasMode->drawControls(&qp);
m_viewMode.forceRedraw = false;
641,6 → 712,166
 
 
 
void Canvas::drawContentsOld(QPainter *psx, int clipx, int clipy, int clipw, int cliph)
{
if (m_doc->isLoading())
return;
// if (!updateOn)
// return;
// QTime tim;
// tim.start();
psx->setRenderHint(QPainter::Antialiasing, false);
psx->setRenderHint(QPainter::SmoothPixmapTransform, false);
if ((clipw > 0) && (cliph > 0))
{
 
if ((m_viewMode.specialRendering) || (m_doc->appMode == modeEditClip && m_viewMode.specialRendering))
{
if (m_viewMode.firstSpecial)
{
#ifdef Q_WS_MAC
QPoint viewportOrigin = mapToGlobal(QPoint(0,0));
m_buffer = QPixmap::grabWindow(this->winId(), viewportOrigin.x(), viewportOrigin.y(), this->width(), this->height());
//m_buffer.resize(this->width(), this->height());
//this->render(m_buffer);
// qDebug(QString("drawContents:viewport (%1,%2) %3x%4 -> %5x%6").arg(viewportOrigin.x()).arg(viewportOrigin.y())
// .arg(this->width()).arg(this->height()).arg(m_buffer.width()).arg(m_buffer.height()));
#else
m_buffer = QPixmap::grabWindow(this->winId(), 0, 0);
#endif
m_viewMode.firstSpecial = false;
}
QPainter pp;
QPixmap ppx = m_buffer;
pp.begin(&ppx);
pp.setRenderHint(QPainter::Antialiasing, true);
drawControls(&pp);
pp.end();
psx->resetMatrix();
psx->drawPixmap(0,0,ppx);
return;
}
 
drawContents(psx, clipx, clipy, clipw, cliph);
}
/* psx->setRenderHint(QPainter::Antialiasing, true);
if (operItemMoving || operItemResizing)
{
if (operItemResizing)
{
if (!redrawPolygon.isEmpty())
{
if (m_MouseButtonPressed && (m_doc->appMode == modeDrawFreehandLine))
{
psx->resetMatrix();
QPoint out = contentsToViewport(QPoint(0, 0));
psx->translate(out.x(), out.y());
psx->translate(-qRound(m_doc->minCanvasCoordinate.x()*m_viewMode.scale), -qRound(m_doc->minCanvasCoordinate.y()*m_viewMode.scale));
psx->scale(m_viewMode.scale, m_viewMode.scale);
psx->setBrush(Qt::NoBrush);
psx->setPen(QPen(Qt::black, 1.0 / m_viewMode.scale, Qt::DotLine, Qt::FlatCap, Qt::MiterJoin));
psx->drawPolyline(redrawPolygon);
redrawPolygon.clear();
}
else
{
QColor drawColor = qApp->palette().color(QPalette::Active, QColorGroup::Highlight);
psx->setPen(QPen(drawColor, 1, Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin));
drawColor.setAlpha(64);
psx->setBrush(drawColor);
psx->drawPolygon(redrawPolygon);
redrawPolygon.clear();
}
}
}
else
{
if (m_doc->m_Selection->count() != 0)
{
uint selectedItemCount = m_doc->m_Selection->count();
PageItem *currItem = m_doc->m_Selection->itemAt(0);
if (selectedItemCount < moveWithBoxesOnlyThreshold)
{
for (uint cu = 0; cu < selectedItemCount; cu++)
{
currItem = m_doc->m_Selection->itemAt(cu);
psx->resetMatrix();
QPoint out = contentsToViewport(QPoint(0, 0));
psx->translate(out.x(), out.y());
psx->translate(-qRound(m_doc->minCanvasCoordinate.x()*m_viewMode.scale), -qRound(m_doc->minCanvasCoordinate.y()*m_viewMode.scale));
Transform(currItem, psx);
psx->setBrush(Qt::NoBrush);
psx->setPen(QPen(Qt::black, 1.0 / m_viewMode.scale, Qt::DotLine, Qt::FlatCap, Qt::MiterJoin));
if (selectedItemCount < moveWithFullOutlinesThreshold)
{
if (!(currItem->asLine()))
currItem->DrawPolyL(psx, currItem->Clip);
else
{
if (currItem->asLine())
{
int lw2 = 1;
int lw = 1;
Qt::PenCapStyle le = Qt::FlatCap;
if (currItem->NamedLStyle.isEmpty())
{
lw2 = qRound(currItem->lineWidth() / 2.0);
lw = qRound(qMax(currItem->lineWidth(), 1.0));
le = currItem->PLineEnd;
}
else
{
multiLine ml = m_doc->MLineStyles[currItem->NamedLStyle];
lw2 = qRound(ml[ml.size()-1].Width / 2.0);
lw = qRound(qMax(ml[ml.size()-1].Width, 1.0));
le = static_cast<Qt::PenCapStyle>(ml[ml.size()-1].LineEnd);
}
if (le != Qt::FlatCap)
psx->drawRect(-lw2, -lw2, qRound(currItem->width())+lw, lw);
else
psx->drawRect(-1, -lw2, qRound(currItem->width()), lw);
}
}
}
else
psx->drawRect(0, 0, static_cast<int>(currItem->width())+1, static_cast<int>(currItem->height())+1);
}
}
else
{
double gx, gy, gw, gh;
m_doc->m_Selection->setGroupRect();
getGroupRectScreen(&gx, &gy, &gw, &gh);
QPoint out = contentsToViewport(QPoint(0, 0));
psx->resetMatrix();
psx->translate(-out.x(), -out.y());
psx->translate(qRound(gx), qRound(gy));
psx->scale(m_viewMode.scale, m_viewMode.scale);
psx->drawRect(QRect(0, 0, qRound(gw), qRound(gh)));
}
}
}
}
else
{ */
if ((m_doc->m_Selection->count() != 0) && !(m_viewMode.operItemMoving || m_viewMode.operItemResizing) && (m_doc->appMode != modeDrawBezierLine))
{
drawControlsSelection(psx, m_doc->m_Selection->itemAt(0));
}
/* } */
//FIXME if (m_doc->appMode == modeEdit)
// slotDoCurs(true);
if (m_doc->appMode == modeEditGradientVectors)
{
drawControlsGradientVectors(psx, m_doc->m_Selection->itemAt(0));
}
//FIXME evSpon = false;
// forceRedraw = false;
// qDebug( "Time elapsed: %d ms", tim.elapsed() );
}
 
 
 
/**
*/
862,8 → 1093,9
*/
void Canvas::DrawMasterItems(ScPainter *painter, Page *page, QRect clip)
{
QRect oldR;
FPoint orig = localToCanvas(clip.topLeft());
QRectF cullingArea = QRectF(static_cast<int>(orig.x()), static_cast<int>(orig.y()),
QRect cullingArea = QRect(static_cast<int>(orig.x()), static_cast<int>(orig.y()),
qRound(clip.width() / m_viewMode.scale + 0.5), qRound(clip.height() / m_viewMode.scale + 0.5));
QStack<PageItem*> groupStack;
QStack<PageItem*> groupStack2;
914,12 → 1146,14
currItem->BoundingX = OldBX - Mp->xOffset() + page->xOffset();
currItem->BoundingY = OldBY - Mp->yOffset() + page->yOffset();
}
oldR = currItem->getRedrawBounding(m_viewMode.scale);
oldR.translate(qRound(m_doc->minCanvasCoordinate.x() * m_viewMode.scale), qRound(m_doc->minCanvasCoordinate.y() * m_viewMode.scale));
if (currItem->isGroupControl)
{
painter->save();
currItem->savedOwnPage = currItem->OwnPage;
currItem->OwnPage = page->pageNr();
if ((cullingArea.intersects(currItem->getBoundingRect())) && (m_doc->guidesSettings.layerMarkersShown) && (m_doc->layerCount() > 1))
if ((clip.intersects(oldR)) && (m_doc->guidesSettings.layerMarkersShown) && (m_doc->layerCount() > 1))
currItem->DrawObj(painter, cullingArea);
FPointArray cl = currItem->PoLine.copy();
QMatrix mm;
943,7 → 1177,7
currItem->OwnPage = page->pageNr();
//FIXME if (!evSpon || forceRedraw)
// currItem->invalid = true;
if (cullingArea.intersects(currItem->getBoundingRect()))
if (clip.intersects(oldR))
{
if (!((m_viewMode.operItemMoving || m_viewMode.operItemResizeInEditMode) && (currItem->isSelected())))
{
980,7 → 1214,8
cite->BoundingX = OldBX - Mp->xOffset() + page->xOffset();
cite->BoundingY = OldBY - Mp->yOffset() + page->yOffset();
}
if ((cullingArea.intersects(cite->getBoundingRect())) && (m_doc->guidesSettings.layerMarkersShown) && (m_doc->layerCount() > 1))
oldR = cite->getRedrawBounding(m_viewMode.scale);
if ((clip.intersects(oldR)) && (m_doc->guidesSettings.layerMarkersShown) && (m_doc->layerCount() > 1))
cite->DrawObj(painter, cullingArea);
cite->OwnPage = cite->savedOwnPage;
if (!currItem->ChangedMasterItem)
1022,7 → 1257,9
currItem->BoundingX = OldBX - Mp->xOffset() + page->xOffset();
currItem->BoundingY = OldBY - Mp->yOffset() + page->yOffset();
}
if (cullingArea.intersects(currItem->getBoundingRect()))
oldR = currItem->getRedrawBounding(m_viewMode.scale);
oldR.translate(qRound(m_doc->minCanvasCoordinate.x() * m_viewMode.scale), qRound(m_doc->minCanvasCoordinate.y() * m_viewMode.scale));
if (clip.intersects(oldR))
{
painter->save();
painter->translate(currItem->xPos(), currItem->yPos());
1070,8 → 1307,9
void Canvas::DrawPageItems(ScPainter *painter, QRect clip)
{
m_viewMode.linkedFramesToShow.clear();
QRect oldR;
FPoint orig = localToCanvas(clip.topLeft());
QRectF cullingArea = QRectF(static_cast<int>(orig.x()), static_cast<int>(orig.y()),
QRect cullingArea = QRect(static_cast<int>(orig.x()), static_cast<int>(orig.y()),
qRound(clip.width() / m_viewMode.scale + 0.5), qRound(clip.height() / m_viewMode.scale + 0.5));
QStack<PageItem*> groupStack;
QStack<PageItem*> groupStack2;
1116,6 → 1354,8
if (currItem->OnMasterPage != m_doc->currentPage()->pageName())
continue;
}
oldR = currItem->getRedrawBounding(m_viewMode.scale);
oldR.translate(qRound(m_doc->minCanvasCoordinate.x() * m_viewMode.scale), qRound(m_doc->minCanvasCoordinate.y() * m_viewMode.scale));
if (currItem->isGroupControl)
{
painter->save();
1129,7 → 1369,7
groupStack2.push(currItem);
continue;
}
if (cullingArea.intersects(currItem->getBoundingRect()))
if (clip.intersects(oldR))
{
//FIXME if (!evSpon || forceRedraw)
// currItem->invalid = true;
1197,7 → 1437,8
painter->endLayer();
painter->restore();
PageItem *cite = groupStack2.pop();
if ((cullingArea.intersects(cite->getBoundingRect())) && (((m_doc->guidesSettings.layerMarkersShown) && (m_doc->layerCount() > 1)) || (cite->textFlowUsesContourLine())))
oldR = cite->getRedrawBounding(m_viewMode.scale);
if ((clip.intersects(oldR)) && (((m_doc->guidesSettings.layerMarkersShown) && (m_doc->layerCount() > 1)) || (cite->textFlowUsesContourLine())))
cite->DrawObj(painter, cullingArea);
groupStack.pop();
if (groupStack.count() == 0)
1220,7 → 1461,9
continue;
if ((m_viewMode.viewAsPreview) && (!currItem->printEnabled()))
continue;
if (cullingArea.intersects(currItem->getBoundingRect()))
oldR = currItem->getRedrawBounding(m_viewMode.scale);
oldR.translate(qRound(m_doc->minCanvasCoordinate.x() * m_viewMode.scale), qRound(m_doc->minCanvasCoordinate.y() * m_viewMode.scale));
if (clip.intersects(oldR))
{
painter->save();
painter->translate(currItem->xPos(), currItem->yPos());
/trunk/Scribus/scribus/canvas.h
200,6 → 200,7
void drawControlsFreehandLine(QPainter* pp);
void drawControlsSelection(QPainter* pp, PageItem *currItem);
void drawControlsSelectionSpecial(QPainter* pp, PageItem *currItem);
virtual void drawContentsOld(QPainter *p, int clipx, int clipy, int clipw, int cliph);
void getClipPathForPages(FPointArray* PoLine);
void calculateFrameLinkPoints(PageItem* pi1, PageItem* pi2, FPoint& start, FPoint& end);
/trunk/Scribus/scribus/pageitem_textframe.cpp
2172,7 → 2172,7
}
}
 
void PageItem_TextFrame::DrawObj_Item(ScPainter *p, QRectF cullingArea, double sc)
void PageItem_TextFrame::DrawObj_Item(ScPainter *p, QRect cullingArea, double sc)
{
layout();
if (invalid)
/trunk/Scribus/scribus/pageitem.h
31,7 → 31,6
#include <QList>
#include <QKeyEvent>
#include <QMenu>
#include <QRect>
#include <QRectF>
 
#include "scribusapi.h"
240,10 → 239,10
/** Zeichnet das Item */
void paintObj(QPainter *p);
void DrawObj(ScPainter *p, QRectF e);
void DrawObj(ScPainter *p, QRect e);
void DrawObj_Pre(ScPainter *p, double &sc);
virtual void DrawObj_Post(ScPainter *p);
virtual void DrawObj_Item(ScPainter *p, QRectF e, double sc) = 0;
virtual void DrawObj_Item(ScPainter *p, QRect e, double sc) = 0;
QImage DrawObj_toImage();
QImage DrawObj_toImage(QList<PageItem*> &emG);
252,13 → 251,13
protected:
void DrawObj_ImageFrame(ScPainter *p, double sc);
//void DrawObj_TextFrame(ScPainter *p, QRectF e, double sc);
//void DrawObj_TextFrame(ScPainter *p, QRect e, double sc);
//void DrawObj_Line(ScPainter *p);
void DrawObj_Polygon(ScPainter *p);
void DrawObj_PolyLine(ScPainter *p);
void DrawObj_PathText(ScPainter *p, double sc);
public:
void DrawObj_Embedded(ScPainter *p, QRectF e, const CharStyle& style, PageItem* cembedded);
void DrawObj_Embedded(ScPainter *p, QRect e, const CharStyle& style, PageItem* cembedded);
void SetFrameShape(int count, double *vals);
void SetRectFrame();
void SetOvalFrame();
/trunk/Scribus/scribus/pageitem_textframe.h
23,7 → 23,7
#define PAGEITEMTEXTFRAME_H
 
#include <QMap>
#include <QRectF>
#include <QRect>
#include <QString>
#include <QKeyEvent>
 
77,7 → 77,7
#endif
protected:
virtual void DrawObj_Item(ScPainter *p, QRectF e, double sc);
virtual void DrawObj_Item(ScPainter *p, QRect e, double sc);
virtual void DrawObj_Post(ScPainter *p);
void drawOverflowMarker(ScPainter *p);
void drawColumnBorders(ScPainter *p);
/trunk/Scribus/scribus/pageitem_latexframe.h
88,7 → 88,7
QMap<QString,QString> editorProperties;
protected:
virtual void DrawObj_Item(ScPainter *p, QRectF e, double sc);
virtual void DrawObj_Item(ScPainter *p, QRect e, double sc);
QString formulaText;
/trunk/Scribus/scribus/pageitem_latexframe.cpp
162,7 → 162,7
imgValid = false;
}
 
void PageItem_LatexFrame::DrawObj_Item(ScPainter *p, QRectF e, double sc)
void PageItem_LatexFrame::DrawObj_Item(ScPainter *p, QRect e, double sc)
{
if (!imgValid && !err) {
if (latex->state() == QProcess::NotRunning) {
/trunk/Scribus/scribus/pageitem_polyline.h
23,7 → 23,7
#define PAGEITEM_POLYLINE_H
 
#include <QString>
#include <QRectF>
#include <QRect>
 
#include "scribusapi.h"
#include "pageitem.h"
45,7 → 45,7
virtual QString infoDescription();
 
protected:
virtual void DrawObj_Item(ScPainter *p, QRectF e, double sc);
virtual void DrawObj_Item(ScPainter *p, QRect e, double sc);
 
};
 
/trunk/Scribus/scribus/pageitem_polyline.cpp
47,7 → 47,7
{
}
 
void PageItem_PolyLine::DrawObj_Item(ScPainter *p, QRectF /*e*/, double /*sc*/)
void PageItem_PolyLine::DrawObj_Item(ScPainter *p, QRect /*e*/, double /*sc*/)
{
if (!m_Doc->RePos && PoLine.size()>=4)
{
/trunk/Scribus/scribus/pageitem_pathtext.cpp
62,7 → 62,7
void PageItem_PathText::layout()
{
QImage pgPix(10, 10, QImage::Format_ARGB32);
QRectF rd; // = QRect(0,0,9,9);
QRect rd; // = QRect(0,0,9,9);
ScPainter *painter = new ScPainter(&pgPix, pgPix.width(), pgPix.height());
DrawObj(painter, rd);
painter->end();
72,7 → 72,7
}
 
 
void PageItem_PathText::DrawObj_Item(ScPainter *p, QRectF cullingArea, double sc)
void PageItem_PathText::DrawObj_Item(ScPainter *p, QRect cullingArea, double sc)
{
itemText.invalidateAll();
firstChar = 0;
/trunk/Scribus/scribus/pageitem_imageframe.h
23,7 → 23,7
#define PAGEITEM_IMAGEFRAME_H
 
#include <QString>
#include <QRectF>
#include <QRect>
#include <QKeyEvent>
 
#include "scribusapi.h"
50,7 → 50,7
virtual QString infoDescription();
protected:
virtual void DrawObj_Item(ScPainter *p, QRectF e, double sc);
virtual void DrawObj_Item(ScPainter *p, QRect e, double sc);
 
};
 
/trunk/Scribus/scribus/pageitem_line.cpp
48,7 → 48,7
{
}
 
void PageItem_Line::DrawObj_Item(ScPainter *p, QRectF /*e*/, double /*sc*/)
void PageItem_Line::DrawObj_Item(ScPainter *p, QRect /*e*/, double /*sc*/)
{
if (!m_Doc->RePos)
{
/trunk/Scribus/scribus/pageitem_line.h
23,7 → 23,7
#define PAGEITEMLINE_H
 
#include <QString>
#include <QRectF>
#include <QRect>
 
#include "scribusapi.h"
#include "pageitem.h"
45,7 → 45,7
virtual QString infoDescription();
protected:
virtual void DrawObj_Item(ScPainter *p, QRectF e, double sc);
virtual void DrawObj_Item(ScPainter *p, QRect e, double sc);
 
};
 
/trunk/Scribus/scribus/pageitem_pathtext.h
23,7 → 23,7
#define PAGEITEM_PATHTEXT_H
 
#include <QString>
#include <QRectF>
#include <QRect>
 
#include "scribusapi.h"
#include "pageitem.h"
47,7 → 47,7
virtual QString infoDescription();
 
protected:
virtual void DrawObj_Item(ScPainter *p, QRectF e, double sc);
virtual void DrawObj_Item(ScPainter *p, QRect e, double sc);
 
};
 
/trunk/Scribus/scribus/pageitem_imageframe.cpp
53,7 → 53,7
{
}
 
void PageItem_ImageFrame::DrawObj_Item(ScPainter *p, QRectF /*e*/, double sc)
void PageItem_ImageFrame::DrawObj_Item(ScPainter *p, QRect /*e*/, double sc)
{
if(!m_Doc->RePos)
{
/trunk/Scribus/scribus/pageitem_polygon.cpp
48,7 → 48,7
{
}
 
void PageItem_Polygon::DrawObj_Item(ScPainter *p, QRectF /*e*/, double /*sc*/)
void PageItem_Polygon::DrawObj_Item(ScPainter *p, QRect /*e*/, double /*sc*/)
{
if (!m_Doc->RePos)
{
/trunk/Scribus/scribus/pageitem_polygon.h
23,7 → 23,7
#define PAGEITEM_POLYGON_H
 
#include <QString>
#include <QRectF>
#include <QRect>
 
#include "scribusapi.h"
#include "pageitem.h"
46,7 → 46,7
virtual QString infoDescription();
protected:
virtual void DrawObj_Item(ScPainter *p, QRectF e, double sc);
virtual void DrawObj_Item(ScPainter *p, QRect e, double sc);
 
};