office/okular
office/okular
1
0
Fork 0
mirror of https://invent.kde.org/graphics/okular synced 2024-10-05 15:39:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

use a yellow color if the annotation's one is not valid

Browse source 
svn path=/trunk/KDE/kdegraphics/okular/; revision=765918
This commit is contained in:
Pino Toscano 2008-01-24 21:48:03 +00:00
parent 194048d6c6
commit 66c950fcbb
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
ui/pagepainter.cpp
View file

@ -312,7 +312,10 @@ void PagePainter::paintPageOnPainter( QPainter * destPainter, const Okular::Page
{
Okular::Annotation * a = *aIt;
Okular::Annotation::SubType type = a->subType();
QColor acolor( a->style().color().red(), a->style().color().green(), a->style().color().blue(), (int)( 255.0 * a->style().opacity() ) );
QColor acolor = a->style().color();
if ( !acolor.isValid() )
acolor = Qt::yellow;
acolor.setAlphaF( a->style().opacity() );
// draw LineAnnotation MISSING: all
if ( type == Okular::Annotation::ALine )
@ -496,6 +499,11 @@ void PagePainter::paintPageOnPainter( QPainter * destPainter, const Okular::Page
if ( opacity <= 0 && a->subType() != Okular::Annotation::AText )
continue;
QColor acolor = a->style().color();
if ( !acolor.isValid() )
acolor = Qt::yellow;
acolor.setAlpha( opacity );
// get annotation boundary and drawn rect
QRect annotBoundary = a->transformedBoundingRectangle().geometry( scaledWidth, scaledHeight );
QRect annotRect = annotBoundary.intersect( limits );
@ -511,7 +519,7 @@ void PagePainter::paintPageOnPainter( QPainter * destPainter, const Okular::Page
if ( text->textType() == Okular::TextAnnotation::InPlace )
{
QImage image( annotBoundary.size(), QImage::Format_ARGB32 );
image.fill( qRgba( a->style().color().red(), a->style().color().green(), a->style().color().blue(), opacity ) );
image.fill( acolor.rgba() );
QPainter painter( &image );
painter.setPen( Qt::black );
painter.setFont( text->textFont() );
@ -582,7 +590,7 @@ void PagePainter::paintPageOnPainter( QPainter * destPainter, const Okular::Page
// width is already divided by two
double width = geom->geometricalPointWidth() * Okular::Utils::dpiX() / ( 72.0 * 2.0 ) * scaledWidth / page->width();
QPainter p( &shape );
p.setPen( QPen( QBrush( QColor( a->style().color().red(), a->style().color().green(), a->style().color().blue(), opacity ) ), width * 2, Qt::SolidLine, Qt::SquareCap, Qt::MiterJoin ) );
p.setPen( QPen( QBrush( acolor ), width * 2, Qt::SolidLine, Qt::SquareCap, Qt::MiterJoin ) );
QRectF r( .0, .0, annotBoundary.width(), annotBoundary.height() );
r.adjust( width, width, -width, -width );
if ( geom->geometricalType() == Okular::GeomAnnotation::InscribedSquare )