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

List:       kde-commits
Subject:    extragear/multimedia/kmplayer/src
From:       Koos Vriezen <koos.vriezen () gmail ! com>
Date:       2012-01-02 14:20:31
Message-ID: 20120102142031.2799FAC7DB () svn ! kde ! org
[Download RAW message or body]

SVN commit 1271089 by vriezen:

Strip alpha value for text colors

Fixes using text color properties when used with animateColor

 M  +10 -3     kmplayer_smil.cpp  


--- trunk/extragear/multimedia/kmplayer/src/kmplayer_smil.cpp #1271088:1271089
@@ -1244,6 +1244,13 @@
     opacity = 100;
 }
 
+static unsigned int rgbFromValue (const QString& val) {
+    SmilColorProperty p;
+    p.init();
+    p.setColor (val);
+    return 0xffffff & p.color;
+}
+
 void SmilColorProperty::setColor (const QString &val)
 {
     if (val.isEmpty () || val == "transparent")
@@ -3938,7 +3945,7 @@
 void
 SMIL::TextMediaType::parseParam (const TrieString &name, const QString &val) {
     if (name == "color" || name == "fontColor") {
-        font_color = val.isEmpty () ? 0 : QColor (val).rgb ();
+        font_color = val.isEmpty () ? 0 : rgbFromValue (val);
     } else if (name == "fontFace") {
         if (val.toLower ().indexOf ("sans" ) < 0)
             font_name = "serif";
@@ -4234,9 +4241,9 @@
         else
             text_align = AlignInherit;
     } else if (name == "textBackgroundColor") {
-        background_color = 0xffffff & QColor (val).rgb ();
+        background_color = rgbFromValue (val);
     } else if (name == "textColor") {
-        font_color = 0xffffff & QColor (val).rgb ();
+        font_color = rgbFromValue (val);
     } else if (name == "textDirection") {
         if (val == "ltr")
             text_direction = DirLtr;
[prev in list] [next in list] [prev in thread] [next in thread]