anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-08 20:32:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add the ability to set the background colour of an image to

Browse Source 
LColor::graphicsbg.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8719 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Angus Leeming 2004-05-02 11:10:22 +00:00
parent ee3c83ff49
commit ca9190c9d1
3 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/frontends/qt2/ChangeLog
View File

@ -1,3 +1,11 @@
2004-05-02 Angus Leeming <leeming@lyx.org>
* QLPainter.C (image): set the background colour to
LColor::graphicsbg.
* QLImage.C (setPixmap_impl): remove commented out xforms code
to set pixmap background colour.
2004-05-02 Georg Baum <Georg.Baum@post.rwth-aachen.de>
* QGraphics.C: #include <cmath> (STLport compile fix for floor())

13
src/frontends/qt2/QLImage.C
View File

@ -158,7 +158,7 @@ QImage & toGray(QImage & img)
{
if (img.width() == 0 || img.height() == 0)
return img;
int const pixels = img.depth() > 8 ?
img.width() * img.height() : img.numColors();
@ -197,17 +197,6 @@ bool QLImage::setPixmap_impl(Params const & params)
default:
break;
}
// FIXME
#if 0
unsigned int fill = packedcolor(LColor::graphicsbg);
if (fill != image_->fill_color) {
// the background color has changed.
// Note that in grayscale/monochrome images the background is
// grayed also, so this call will have no visible effect. Sorry!
flimage_replace_pixel(image_, image_->fill_color, fill);
image_->fill_color = fill;
}
#endif
return true;
}

6
src/frontends/qt2/QLPainter.C
View File

@ -166,7 +166,11 @@ void QLPainter::arc(int x, int y, unsigned int w, unsigned int h,
void QLPainter::image(int x, int y, int w, int h,
lyx::graphics::Image const & i)
{
qp_->drawPixmap(x, y, static_cast<lyx::graphics::QLImage const &>(i).qpixmap(), 0, 0, w, h);
lyx::graphics::QLImage const & qlimage =
static_cast<lyx::graphics::QLImage const &>(i);
fillRectangle(x, y, w, h, LColor::graphicsbg);
qp_->drawPixmap(x, y, qlimage.qpixmap(), 0, 0, w, h);
}