[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-core-devel
Subject:    Re: patch for kwin/clients/kde1/kde1client.cpp
From:       Rik Hemsley <rik () kde ! org>
Date:       2001-07-27 21:56:55
[Download RAW message or body]

#if Waldo Bastian

> I would appreciate it if the gradients could be removed from the KDE2 default 
> style though. I don't think it is necassery to have gradients everywhere and 
> I think solid colors look better and give the interface a less busy/crowded 
> look.

I agree, Hmm, the KDE 2.1 style seems to use gradients even when you
didn't configure one. Duh. 

Ok, I fixed that. Patch attached.

Rik

p.s. removal of the 'bool highcolor' from lower down in the file is
simply because the variable is unused.


["kdedefault.diff" (text/plain)]

Index: kdedefault.cpp
===================================================================
RCS file: /home/kde/kdebase/kwin/clients/default/kdedefault.cpp,v
retrieving revision 1.4
diff -u -3 -p -r1.4 kdedefault.cpp
--- kdedefault.cpp	2001/07/04 06:52:50	1.4
+++ kdedefault.cpp	2001/07/27 21:55:40
@@ -197,30 +197,44 @@ void KDEDefaultHandler::createPixmaps()
 	} else
 		titlePix = NULL;
 
-	// Create titlebar gradient images if required
-	if(highcolor)
-	{
-		// Create the titlebar gradients
-		aUpperGradient = new KPixmap;
-		aUpperGradient->resize(128, normalTitleHeight+2);
-		iUpperGradient = new KPixmap;
-        iUpperGradient->resize(128, normalTitleHeight+2);
-        QColorGroup bgColor = options->colorGroup(Options::TitleBar, true);
-		QColorGroup bgColorDrop = options->colorGroup(Options::TitleBlend, true);
+    QColor activeTitleColor1(options->color(Options::TitleBar,      true));
+    QColor activeTitleColor2(options->color(Options::TitleBlend,    true));
+
+    QColor inactiveTitleColor1(options->color(Options::TitleBar,    false));
+    QColor inactiveTitleColor2(options->color(Options::TitleBlend,  false));
+
+    // Create titlebar gradient images if required
+    if(highcolor)
+    {
+      // Create the titlebar gradients
+
+      if (activeTitleColor1 == activeTitleColor2)
+        aUpperGradient = NULL;
+
+      else
+      {
+        aUpperGradient = new KPixmap;
+        aUpperGradient->resize(128, normalTitleHeight+2);
         KPixmapEffect::gradient(*aUpperGradient,
-                                bgColor.midlight(),
-                                bgColorDrop.mid(),
-                                KPixmapEffect::VerticalGradient);
-        bgColor = options->colorGroup(Options::TitleBar, false);
-		bgColorDrop = options->colorGroup(Options::TitleBlend, false);
+          activeTitleColor1,
+          activeTitleColor2,
+          KPixmapEffect::VerticalGradient);
+      }
+
+      if (inactiveTitleColor1 == inactiveTitleColor2)
+        iUpperGradient = NULL;
+
+      else
+      {
+        iUpperGradient = new KPixmap;
+        iUpperGradient->resize(128, normalTitleHeight+2);
+
         KPixmapEffect::gradient(*iUpperGradient,
-                                bgColor.midlight(),
-                                bgColorDrop.mid(),
-                                KPixmapEffect::VerticalGradient);
-    } else {
-		aUpperGradient = NULL;
-		iUpperGradient = NULL;
-	}
+          inactiveTitleColor1,
+          inactiveTitleColor2,
+          KPixmapEffect::VerticalGradient);
+      }
+    }
 
 	// Set the sticky pin pixmaps;
 	QColorGroup g;
@@ -806,7 +820,6 @@ void KDEDefaultClient::paintEvent( QPain
 	QColorGroup g;
 	int offset;
 
-	bool highcolor = useGradients && (QPixmap::defaultDepth() > 8);
 	KPixmap* upperGradient = isActive() ? aUpperGradient : iUpperGradient;
 
     QPainter p(this);


[prev in list] [next in list] [prev in thread] [next in thread]