rpms/kdelibs/devel kdelibs-3.93.0-colorscheme-hack.diff, NONE, 1.1.2.1 kdelibs.spec, 1.223.2.18, 1.223.2.19

[Kevin Kofler (kkofler)]

Author: kkofler

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6911/devel

Modified Files:
      Tag: kdelibs-kde4-branch
	kdelibs.spec 
Added Files:
      Tag: kdelibs-kde4-branch
	kdelibs-3.93.0-colorscheme-hack.diff 
Log Message:
fix strange coloring due to incomplete changes to KColorScheme: KColorScheme was in a state of transition when Beta 2 was released, so disabled text isn't handled properly. This hack restores the August 27 behavior (while keeping the August 29 API).

kdelibs-3.93.0-colorscheme-hack.diff:

--- NEW FILE kdelibs-3.93.0-colorscheme-hack.diff ---
diff -ur kdelibs-3.93.0/kdeui/colors/kcolorscheme.cpp kdelibs-3.93.0-colorscheme-hack/kdeui/colors/kcolorscheme.cpp
--- kdelibs-3.93.0/kdeui/colors/kcolorscheme.cpp	2007-08-29 23:53:42.000000000 +0200
+++ kdelibs-3.93.0-colorscheme-hack/kdeui/colors/kcolorscheme.cpp	2007-09-12 10:22:34.000000000 +0200
@@ -114,8 +114,8 @@
     _colors.deco[1] = cfg.readEntry( "DecorationFocus", QColor(239,132,65) );
 
     // apply state adjustments
-    if (state != QPalette::Active) {
-        // TODO - now tweak all the colors based on the state!
+    if (state == QPalette::Disabled) {
+        _colors.fg[0] = _colors.fg[1];
     }
 
     // calculated backgrounds
@@ -238,11 +238,7 @@
             d = new KColorSchemePrivate(config, state, "Colors:Button", defaultButtonColors);
             break;
         case Selection:
-            // inactiver/disabled uses Window colors instead, ala gtk
-            if (state == QPalette::Active)
-                d = new KColorSchemePrivate(config, state, "Colors:Selection", defaultSelectionColors);
-            else
-                d = new KColorSchemePrivate(config, state, "Colors:Window", defaultSelectionColors);
+            d = new KColorSchemePrivate(config, QPalette::Active, "Colors:Selection", defaultSelectionColors);
             break;
         case Tooltip:
             d = new KColorSchemePrivate(config, state, "Colors:Tooltip", defaultTooltipColors);


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.223.2.18
retrieving revision 1.223.2.19
diff -u -r1.223.2.18 -r1.223.2.19
--- kdelibs.spec	10 Sep 2007 18:21:37 -0000	1.223.2.18
+++ kdelibs.spec	12 Sep 2007 09:51:29 -0000	1.223.2.19
@@ -4,7 +4,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 3.93.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -43,6 +43,10 @@
 Patch2: kdelibs-3.93.0-kde149704.diff
 # fix kde#149705
 Patch3: kdelibs-3.93.0-kde149705.diff
+# KColorScheme was in a state of transition when Beta 2 was released, so
+# disabled text isn't handled properly. This hack restores the August 27
+# behavior (while keeping the August 29 API).
+Patch4: kdelibs-3.93.0-colorscheme-hack.diff
 
 BuildRequires: qt4-devel >= 4.3.0
 %global qt4_ver %(pkg-config QtCore --modversion 2>/dev/null || echo 4.3.0)
@@ -112,6 +116,7 @@
 %patch2 -p0
 popd
 %patch3 -p1
+%patch4 -p1
 
 
 %build
@@ -217,6 +222,9 @@
 
 
 %changelog
+* Wed Sep 12 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-5
+- fix strange coloring due to incomplete changes to KColorScheme
+
 * Mon Sep 10 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.93.0-4
 - use upstream fix (by David Faure) for kde#149704