From b1e3a4f9bb1758beb70327c2c84dc2a2f16a5bd8 Mon Sep 17 00:00:00 2001
From: "Daniel M. Duley" <daniel.duley@verizon.net>
Date: Mon, 22 Nov 1999 13:33:39 +0000
Subject: [PATCH] Use widget bg pixmap if it exists. You can see a small
 screenshot of how system looks now (53K) at
 http://www2.jorsm.com/~mosfet/system2.png. Not as cool IMHO, but clearer.

svn path=/trunk/kdebase/kwin/; revision=34692
---
 stdclient_bitmaps.h |  3 ++-
 systemclient.cpp    | 34 +++++++++++++++++++++++++---------
 2 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/stdclient_bitmaps.h b/stdclient_bitmaps.h
index 8d561878bc..0d471c58a1 100644
--- a/stdclient_bitmaps.h
+++ b/stdclient_bitmaps.h
@@ -125,4 +125,5 @@ static unsigned char pinup_mask_bits[] = {
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
 
 
-#endif
\ No newline at end of file
+#endif
+
diff --git a/systemclient.cpp b/systemclient.cpp
index 7a6b765d63..1cfffb9c33 100644
--- a/systemclient.cpp
+++ b/systemclient.cpp
@@ -41,19 +41,26 @@ static void create_pixmaps()
 
     // titlebar
     QPainter p;
+    QPainter maskPainter;
     int i, y;
     titlePix = new QPixmap(32, 17);
+    QBitmap mask(32, 17);
+    mask.fill(Qt::color0);
+    
     p.begin(titlePix);
-    p.fillRect(0, 0, 32, 17,
-               QBrush(options->color(Options::Frame, true),
-                      QBrush::SolidPattern));
+    maskPainter.begin(&mask);
+    maskPainter.setPen(Qt::color1);
     for(i=0, y=4; i < 4; ++i, y+=3){
         p.setPen(options->color(Options::TitleBar, true).light(150));
         p.drawLine(0, y, 31, y);
+        maskPainter.drawLine(0, y, 31, y);
         p.setPen(options->color(Options::TitleBar, true).dark(120));
         p.drawLine(0, y+1, 31, y+1);
+        maskPainter.drawLine(0, y+1, 31, y+1);
     }
     p.end();
+    maskPainter.end();
+    titlePix->setMask(mask);
 
     // Bottom frame gradient
     aFramePix = new KPixmap();
@@ -249,18 +256,27 @@ void SystemClient::paintEvent( QPaintEvent* )
     p.drawRect(rect());
     QRect t = titlebar->geometry();
     t.setTop( 1 );
-    qDrawShadePanel(&p, rect().x()+1, rect().y()+1, rect().width()-2,
-                    rect().height()-2,
-                    options->colorGroup(Options::Frame, isActive()), false, 1,
-                    &options->colorGroup(Options::Frame, isActive()).
-                    brush(QColorGroup::Button));
+
+    // if we have a pixmapped bg use that, otherwise use color settings
+    if(colorGroup().brush(QColorGroup::Background).pixmap())
+        qDrawShadePanel(&p, rect().x()+1, rect().y()+1, rect().width()-2,
+                        rect().height()-2, colorGroup(), false, 1,
+                        &colorGroup().brush(QColorGroup::Background));
+    else
+        qDrawShadePanel(&p, rect().x()+1, rect().y()+1, rect().width()-2,
+                        rect().height()-2,
+                        options->colorGroup(Options::Frame, isActive()), false, 1,
+                        &options->colorGroup(Options::Frame, isActive()).
+                        brush(QColorGroup::Button));
     t.setTop( 2 );
     if(isActive())
         p.drawTiledPixmap(t, *titlePix);
+    else if(colorGroup().brush(QColorGroup::Background).pixmap())
+        p.fillRect(t, colorGroup().brush(QColorGroup::Background));
     else
         p.fillRect(t, options->colorGroup(Options::Frame, false).
                    brush(QColorGroup::Button));
-
+        
 
 
     QRegion r = rect();