Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 5618 → Rev 5619

/branches/Version13x/Scribus/scribus/pageitem_line.cpp
66,7 → 66,7
{
if (!m_Doc->RePos)
{
if (m_Doc->layerOutline(m_Doc->layerLevelFromNumber(LayerNr)))
if (m_Doc->layerOutline(LayerNr))
p->drawLine(FPoint(0, 0), FPoint(Width, 0));
else
{
96,7 → 96,7
arrowTrans.scale(-1,1);
arrow.map(arrowTrans);
p->setupPolygon(&arrow);
if (m_Doc->layerOutline(m_Doc->layerLevelFromNumber(LayerNr)))
if (m_Doc->layerOutline(LayerNr))
p->strokePath();
else
{
115,7 → 115,7
arrowTrans.scale(m_lineWidth, m_lineWidth);
arrow.map(arrowTrans);
p->setupPolygon(&arrow);
if (m_Doc->layerOutline(m_Doc->layerLevelFromNumber(LayerNr)))
if (m_Doc->layerOutline(LayerNr))
p->strokePath();
else
{
/branches/Version13x/Scribus/scribus/pageitem_polyline.cpp
66,7 → 66,7
{
if (!m_Doc->RePos && PoLine.size()>=4)
{
if (!m_Doc->layerOutline(m_Doc->layerLevelFromNumber(LayerNr)))
if (!m_Doc->layerOutline(LayerNr))
{
if ((fillColor() != CommonStrings::None) || (GrType != 0))
{
140,7 → 140,7
arrowTrans.scale(m_lineWidth, m_lineWidth);
arrow.map(arrowTrans);
p->setupPolygon(&arrow);
if (m_Doc->layerOutline(m_Doc->layerLevelFromNumber(LayerNr)))
if (m_Doc->layerOutline(LayerNr))
p->strokePath();
else
{
170,7 → 170,7
arrowTrans.scale(m_lineWidth, m_lineWidth);
arrow.map(arrowTrans);
p->setupPolygon(&arrow);
if (m_Doc->layerOutline(m_Doc->layerLevelFromNumber(LayerNr)))
if (m_Doc->layerOutline(LayerNr))
p->strokePath();
else
{
/branches/Version13x/Scribus/scribus/pageitem_pathtext.cpp
87,7 → 87,7
double segLen = 0;
double distCurX;
CurX = Extra;
if (!m_Doc->layerOutline(m_Doc->layerLevelFromNumber(LayerNr)))
if (!m_Doc->layerOutline(LayerNr))
{
if (lineColor() != CommonStrings::None && PoShow)
{
/branches/Version13x/Scribus/scribus/scpainter.cpp
1019,11 → 1019,17
double g = qGreen( qStopColor.rgb() ) / 255.0;
double b = qBlue( qStopColor.rgb() ) / 255.0;
double a = colorStops[offset]->opacity;
cairo_pattern_add_color_stop_rgba (pat, colorStops[ offset ]->rampPoint, r, g, b, a);
/* if (a == 1.0)
cairo_pattern_add_color_stop_rgb (pat, colorStops[ offset ]->rampPoint, r, g, b);
else */
cairo_pattern_add_color_stop_rgba (pat, colorStops[ offset ]->rampPoint, r, g, b, a);
}
cairo_set_source (m_cr, pat);
cairo_clip_preserve (m_cr);
cairo_paint_with_alpha (m_cr, fill_trans);
/* if (fill_trans == 1.0)
cairo_paint(m_cr);
else */
cairo_paint_with_alpha (m_cr, fill_trans);
cairo_pattern_destroy (pat);
}
else
1031,7 → 1037,10
double r = qRed( m_fill.rgb() ) / 255.0;
double g = qGreen( m_fill.rgb() ) / 255.0;
double b = qBlue( m_fill.rgb() ) / 255.0;
cairo_set_source_rgba( m_cr, r, g, b, fill_trans );
/* if (fill_trans == 1.0)
cairo_set_source_rgb( m_cr, r, g, b);
else */
cairo_set_source_rgba( m_cr, r, g, b, fill_trans );
cairo_fill_preserve( m_cr );
}
}
1053,7 → 1062,10
double r = qRed( m_stroke.rgb() ) / 255.0;
double g = qGreen( m_stroke.rgb() ) / 255.0;
double b = qBlue( m_stroke.rgb() ) / 255.0;
cairo_set_source_rgba( m_cr, r, g, b, stroke_trans );
/* if (stroke_trans == 1.0)
cairo_set_source_rgb( m_cr, r, g, b);
else */
cairo_set_source_rgba( m_cr, r, g, b, stroke_trans );
if( PLineEnd == Qt::RoundCap )
cairo_set_line_cap (m_cr, CAIRO_LINE_CAP_ROUND);
else if( PLineEnd == Qt::SquareCap )
/branches/Version13x/Scribus/scribus/pageitem.cpp
736,7 → 736,7
return;
}
DrawObj_Pre(p, sc);
if (m_Doc->layerOutline(m_Doc->layerLevelFromNumber(LayerNr)))
if (m_Doc->layerOutline(LayerNr))
{
if (itemType()==TextFrame || itemType()==ImageFrame || itemType()==PathText || itemType()==Line || itemType()==PolyLine)
DrawObj_Item(p, e, sc);
758,9 → 758,9
// p->rotate(Rot);
}
p->rotate(Rot);
if (m_Doc->layerOutline(m_Doc->layerLevelFromNumber(LayerNr)))
if (m_Doc->layerOutline(LayerNr))
{
p->setPen(m_Doc->layerMarker(m_Doc->layerLevelFromNumber(LayerNr)), 1, SolidLine, FlatCap, MiterJoin);
p->setPen(m_Doc->layerMarker(LayerNr), 1, SolidLine, FlatCap, MiterJoin);
p->setFillMode(ScPainter::None);
p->setBrushOpacity(1.0);
p->setPenOpacity(1.0);
827,11 → 827,11
{
bool doStroke=true;
ScribusView* view = m_Doc->view();
if (m_Doc->layerOutline(m_Doc->layerLevelFromNumber(LayerNr)))
if (m_Doc->layerOutline(LayerNr))
{
if (itemType()!=Line)
{
p->setPen(m_Doc->layerMarker(m_Doc->layerLevelFromNumber(LayerNr)), 1, SolidLine, FlatCap, MiterJoin);
p->setPen(m_Doc->layerMarker(LayerNr), 1, SolidLine, FlatCap, MiterJoin);
p->setFillMode(ScPainter::None);
p->setBrushOpacity(1.0);
p->setPenOpacity(1.0);
937,16 → 937,16
p->setupPolygon(&ContourLine);
p->strokePath();
}
if ((m_Doc->guidesSettings.layerMarkersShown) && (m_Doc->layerCount() > 1) && (!m_Doc->layerOutline(m_Doc->layerLevelFromNumber(LayerNr))))
if ((m_Doc->guidesSettings.layerMarkersShown) && (m_Doc->layerCount() > 1) && (!m_Doc->layerOutline(LayerNr)))
{
p->setBrush(m_Doc->layerMarker(m_Doc->layerLevelFromNumber(LayerNr)));
p->setPen(black, 0.5/ m_Doc->view()->scale(), SolidLine, FlatCap, MiterJoin);
p->setPenOpacity(1.0);
p->setBrush(m_Doc->layerMarker(LayerNr));
p->setBrushOpacity(1.0);
p->setFillMode(ScPainter::Solid);
p->setLineWidth(0);
double ofwh = 10;
double ofx = Width - ofwh/2;
double ofy = Height - ofwh*3;
p->setPenOpacity(1.0);
p->setBrushOpacity(1.0);
p->drawRect(ofx, ofy, ofwh, ofwh);
}
//CB disabled for now
1387,10 → 1387,10
bool fr = p->fillRule();
p->setFillRule(false);
p->setupTextPolygon(&gly);
if (m_Doc->layerOutline(m_Doc->layerLevelFromNumber(LayerNr)))
if (m_Doc->layerOutline(LayerNr))
{
p->save();
p->setPen(m_Doc->layerMarker(m_Doc->layerLevelFromNumber(LayerNr)), 0.5, SolidLine, FlatCap, MiterJoin);
p->setPen(m_Doc->layerMarker(LayerNr), 0.5, SolidLine, FlatCap, MiterJoin);
p->setFillMode(ScPainter::None);
p->setBrushOpacity(1.0);
p->setPenOpacity(1.0);
/branches/Version13x/Scribus/scribus/pageitem_textframe.cpp
1707,7 → 1707,7
pf2.begin(view->viewport());
pf2.translate(Xpos, Ypos);
pf2.rotate(Rot);
if (!m_Doc->layerOutline(m_Doc->layerLevelFromNumber(LayerNr)))
if (!m_Doc->layerOutline(LayerNr))
{
if ((fillColor() != CommonStrings::None) || (GrType != 0))
{
3476,9 → 3476,9
void PageItem_TextFrame::DrawObj_Post(ScPainter *p)
{
ScribusView* view = m_Doc->view();
if (m_Doc->layerOutline(m_Doc->layerLevelFromNumber(LayerNr)))
if (m_Doc->layerOutline(LayerNr))
{
p->setPen(m_Doc->layerMarker(m_Doc->layerLevelFromNumber(LayerNr)), 1, SolidLine, FlatCap, MiterJoin);
p->setPen(m_Doc->layerMarker(LayerNr), 1, SolidLine, FlatCap, MiterJoin);
p->setFillMode(ScPainter::None);
p->setBrushOpacity(1.0);
p->setPenOpacity(1.0);
3571,16 → 3571,16
}
if (m_Doc->guidesSettings.colBordersShown && !view->previewMode)
drawColumnBorders(p);
if ((m_Doc->guidesSettings.layerMarkersShown) && (m_Doc->layerCount() > 1) && (!m_Doc->layerOutline(m_Doc->layerLevelFromNumber(LayerNr))))
if ((m_Doc->guidesSettings.layerMarkersShown) && (m_Doc->layerCount() > 1) && (!m_Doc->layerOutline(LayerNr)))
{
p->setBrush(m_Doc->layerMarker(m_Doc->layerLevelFromNumber(LayerNr)));
p->setPen(black, 0.5/ m_Doc->view()->scale(), SolidLine, FlatCap, MiterJoin);
p->setPenOpacity(1.0);
p->setBrush(m_Doc->layerMarker(LayerNr));
p->setBrushOpacity(1.0);
p->setFillMode(ScPainter::Solid);
p->setLineWidth(0);
double ofwh = 10;
double ofx = Width - ofwh/2;
double ofy = Height - ofwh*3;
p->setPenOpacity(1.0);
p->setBrushOpacity(1.0);
p->drawRect(ofx, ofy, ofwh, ofwh);
}
//if (m_Doc->selection->findItem(this)!=-1)
/branches/Version13x/Scribus/scribus/pageitem_imageframe.cpp
66,7 → 66,7
{
if(!m_Doc->RePos)
{
if (!m_Doc->layerOutline(m_Doc->layerLevelFromNumber(LayerNr)))
if (!m_Doc->layerOutline(LayerNr))
{
if ((fillColor() != CommonStrings::None) || (GrType != 0))
{