fixed bug displaying pixmaps with transparency

3 files changed, 15 insertions, 21 deletions

diff --git a/HISTORY b/HISTORY
index e33b285..e3b09ea 100644
--- a/HISTORY
+++ b/HISTORY
@@ -379,3 +379,5 @@ Version 0.5.3
 - added banner to displaymenuschedulescurrentview and 
   displaymenureplaycurrentview
 - immplemented areacontainers to group areas
+- fixed bug displaying pixmaps with transparency
+
diff --git a/libcore/pixmapcontainer.c b/libcore/pixmapcontainer.c
index c60ba54..5cbcf9e 100644
--- a/libcore/pixmapcontainer.c
+++ b/libcore/pixmapcontainer.c
@@ -128,9 +128,8 @@ void cPixmapContainer::CreatePixmap(int num, int Layer, const cRect &ViewPort, c
     pixmaps[num]->Fill(clrTransparent);
     if (pixContainerInit && (fadeTime || shiftTime)) {
         pixmaps[num]->SetAlpha(0);
-    } else if (pixmapsTransparency[num] > 0) {
-        int alpha = (100 - pixmapsTransparency[num])*255/100;
-        pixmaps[num]->SetAlpha(alpha);
+    } else if (pixmapsTransparency[num]) {
+        pixmaps[num]->SetAlpha(pixmapsTransparency[num]);
     }
 }
 
@@ -224,7 +223,7 @@ void cPixmapContainer::SetAlpha(int num, int Alpha) {
 void cPixmapContainer::SetTransparency(int num, int Transparency) {
     if (Transparency < 0 && Transparency > 100)
         return;
-    pixmapsTransparency[num] = Transparency;
+    pixmapsTransparency[num] = (100 - Transparency)*255/100;
 }
 
 void cPixmapContainer::SetLayer(int num, int Layer) {
@@ -352,8 +351,9 @@ int cPixmapContainer::AnimationDelay(void) {
 void cPixmapContainer::FadeIn(void) {
     if (!fadeTime) {
         for (int i = 0; i < numPixmaps; i++) {
-            if (PixmapExists(i))
-                SetAlpha(i, ALPHA_OPAQUE);
+            if (PixmapExists(i)) {
+                SetAlpha(i, pixmapsTransparency[i] ? pixmapsTransparency[i] : ALPHA_OPAQUE);
+            }
         }
         return;
     }
@@ -368,12 +368,8 @@ void cPixmapContainer::FadeIn(void) {
         for (int i = 0; i < numPixmaps; i++) {
             if (!PixmapExists(i))
                 continue;
-            if (pixmapsTransparency[i] > 0) {
-                int alpha = (100 - pixmapsTransparency[i])*Alpha/100;
-                SetAlpha(i, alpha);
-            } else {
-                SetAlpha(i, Alpha);
-            }
+            int alpha = (double)pixmapsTransparency[i] / 255.0 * Alpha;
+            SetAlpha(i, alpha);
         }
         DoFlush();
         int Delta = cTimeMs::Now() - Now;
@@ -398,12 +394,8 @@ void cPixmapContainer::FadeOut(void) {
         for (int i = 0; i < numPixmaps; i++) {
             if (!PixmapExists(i))
                 continue;
-            if (pixmapsTransparency[i] > 0) {
-                int alpha = (100 - pixmapsTransparency[i])*Alpha/100;
-                SetAlpha(i, alpha);
-            } else {
-                SetAlpha(i, Alpha);
-            }
+            int alpha = (double)pixmapsTransparency[i] / 255.0 * Alpha;
+            SetAlpha(i, alpha);
         }
         DoFlush();
         int Delta = cTimeMs::Now() - Now;
@@ -481,7 +473,7 @@ void cPixmapContainer::ShiftInFromBorder(int frames, int frameTime) {
         cRect r = ViewPort(i);
         r.SetPoint(pos.X(), pos.Y());
         SetViewPort(i, r);
-        SetAlpha(i, ALPHA_OPAQUE);
+        SetAlpha(i, pixmapsTransparency[i] ? pixmapsTransparency[i] : ALPHA_OPAQUE);
     }
     DoFlush();
     //Calculating total shifting distance
@@ -635,7 +627,7 @@ void cPixmapContainer::ShiftInFromPoint(int frames, int frameTime) {
         cRect r = ViewPort(i);
         r.SetPoint(startPos);
         SetViewPort(i, r);
-        SetAlpha(i, ALPHA_OPAQUE);
+        SetAlpha(i, pixmapsTransparency[i] ? pixmapsTransparency[i] : ALPHA_OPAQUE);
     }
     DoFlush();
     //Move In
diff --git a/skins/metrixhd/xmlfiles/displaychannel.xml b/skins/metrixhd/xmlfiles/displaychannel.xml
index dea21f1..13b9c07 100644
--- a/skins/metrixhd/xmlfiles/displaychannel.xml
+++ b/skins/metrixhd/xmlfiles/displaychannel.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE displaychannel SYSTEM "../../../dtd/displaychannel.dtd">
 
-<displaychannel x="0" y="0" width="100%" height="100%" fadetime="{fadetime}" shifttime="0" shifttype="bottom" shiftmode="slowed">
+<displaychannel x="0" y="0" width="100%" height="100%" fadetime="{fadetime}" shifttime="{shifttimechannel}" shifttype="bottom" shiftmode="slowed">
     <background>
         <!-- background infobar -->
         <area x="0" y="80%" width="100%" height="20%" layer="1">