From e9f1c31e51f2c2cb55bb01788242153eee3e7734 Mon Sep 17 00:00:00 2001 From: Felix Domke Date: Wed, 10 May 2006 23:20:47 +0000 Subject: [PATCH] don't merge pixmaps when it's not required --- lib/gui/ewidgetdesktop.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/lib/gui/ewidgetdesktop.cpp b/lib/gui/ewidgetdesktop.cpp index 9e092203..eaaa81c8 100644 --- a/lib/gui/ewidgetdesktop.cpp +++ b/lib/gui/ewidgetdesktop.cpp @@ -299,14 +299,17 @@ void eWidgetDesktop::makeCompatiblePixmap(gPixmap &pm) return; } - ePtr pixmap_dc = new gDC(&pm); - gPainter pixmap_painter(pixmap_dc); - ePtr target_pixmap; m_screen.m_dc->getPixmap(target_pixmap); assert(target_pixmap); + if (target_pixmap->surface && target_pixmap->surface->bpp > 8) + return; + + ePtr pixmap_dc = new gDC(&pm); + gPainter pixmap_painter(pixmap_dc); + pixmap_painter.mergePalette(target_pixmap); } -- 2.30.2