From 681caee432d109baae041d7b3b866a8522f72637 Mon Sep 17 00:00:00 2001
From: Lucas Murray <lmurray@undefinedfire.com>
Date: Thu, 11 Jun 2009 05:45:57 +0000
Subject: [PATCH] Sync r937674 from Oxygen.

svn path=/trunk/KDE/kdebase/workspace/; revision=980082
---
 clients/ozone/oxygenclient.cpp | 34 +++++++++++++++++++---------------
 clients/ozone/oxygenclient.h   |  2 +-
 2 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/clients/ozone/oxygenclient.cpp b/clients/ozone/oxygenclient.cpp
index 23d2ff3ad1..16d958a2b7 100644
--- a/clients/ozone/oxygenclient.cpp
+++ b/clients/ozone/oxygenclient.cpp
@@ -353,12 +353,14 @@ void OxygenClient::paintEvent(QPaintEvent *e)
         if (align & Qt::AlignLeft) {
             int left = titleLeft + QFontMetrics(options()->font(isActive(), false)).width(caption()) + 4;
             int right = titleLeft + titleWidth;
-            drawScratch(&painter, palette, left, right, titleTop+6);
+            if (left < right)
+                drawStripes(&painter, palette, left, right, titleTop+6);
         }
         if (align & Qt::AlignRight) {
             int left = titleLeft;
             int right = titleLeft + titleWidth - QFontMetrics(options()->font(isActive(), false)).width(caption()) - 4;
-            drawScratch(&painter, palette, right, left, titleTop+6);
+            if (left < right)
+                drawStripes(&painter, palette, right, left, titleTop+6);
         }
         if (align & Qt::AlignHCenter) {
             int textWidth = QFontMetrics(options()->font(isActive(), false)).width(caption());
@@ -366,8 +368,10 @@ void OxygenClient::paintEvent(QPaintEvent *e)
             int centerLeft = titleLeft + titleWidth/2 - textWidth/2 - 4;
             int centerRight = titleLeft + titleWidth/2 + textWidth/2 + 4;
             int right = titleLeft + titleWidth;
-            drawScratch(&painter, palette, centerLeft, left, titleTop+6);
-            drawScratch(&painter, palette, centerRight, right, titleTop+6);
+            if (left < centerLeft && right > centerRight) {
+                drawStripes(&painter, palette, centerLeft, left, titleTop+6);
+                drawStripes(&painter, palette, centerRight, right, titleTop+6);
+            }
         }
     }
 
@@ -398,19 +402,19 @@ void OxygenClient::paintEvent(QPaintEvent *e)
     renderDot(&painter, QPointF(6.5, 2.5), 1.8);
 }
 
-void OxygenClient::drawScratch(QPainter *p, QPalette &palette, const int start, const int end, const int topMargin)
+void OxygenClient::drawStripes(QPainter *p, QPalette &palette, const int start, const int end, const int topMargin)
 {
-    QLinearGradient scratchlg(QPoint(start,0), QPoint(end,0));
-    scratchlg.setColorAt(0.0, Qt::transparent);
-    scratchlg.setColorAt(0.05, KDecoration::options()->color(ColorTitleBar));
-    scratchlg.setColorAt(1.0, Qt::transparent);
-    QPen pen1(scratchlg, 0.5);
+    QLinearGradient stripeGradient(QPoint(start,0), QPoint(end,0));
+    stripeGradient.setColorAt(0.0, Qt::transparent);
+    stripeGradient.setColorAt(0.05, KDecoration::options()->color(ColorTitleBar));
+    stripeGradient.setColorAt(1.0, Qt::transparent);
+    QPen pen1(stripeGradient, 0.5);
 
-    QLinearGradient scratchlg2(QPoint(start,0), QPoint(end,0));
-    scratchlg2.setColorAt(0.0, Qt::transparent);
-    scratchlg2.setColorAt(0.05, helper_.calcLightColor(palette.color(QPalette::Window)));
-    scratchlg2.setColorAt(1.0, Qt::transparent);
-    QPen pen2(scratchlg2, 0.5);
+    QLinearGradient stripeGradient2(QPoint(start,0), QPoint(end,0));
+    stripeGradient2.setColorAt(0.0, Qt::transparent);
+    stripeGradient2.setColorAt(0.05, helper_.calcLightColor(palette.color(QPalette::Window)));
+    stripeGradient2.setColorAt(1.0, Qt::transparent);
+    QPen pen2(stripeGradient2, 0.5);
 
     bool antialiasing = p->testRenderHint(QPainter::Antialiasing);
     p->setRenderHint(QPainter::Antialiasing, false);
diff --git a/clients/ozone/oxygenclient.h b/clients/ozone/oxygenclient.h
index 70af9f246c..b945501901 100644
--- a/clients/ozone/oxygenclient.h
+++ b/clients/ozone/oxygenclient.h
@@ -58,7 +58,7 @@ public:
 
 private:
     void paintEvent(QPaintEvent *e);
-    void drawScratch(QPainter *p, QPalette &palette, const int start, const int end, const int topMargin);
+    void drawStripes(QPainter *p, QPalette &palette, const int start, const int end, const int topMargin);
     QColor titlebarTextColor(const QPalette &palette);
     bool colorCacheInvalid_;
     QColor cachedTitlebarTextColor_;