Fixed some minor issues

4 files changed, 10 insertions, 3 deletions

diff --git a/displaymenuview.c b/displaymenuview.c
index a454402..f418990 100644
--- a/displaymenuview.c
+++ b/displaymenuview.c
@@ -763,7 +763,7 @@ void cNopacityDisplayMenuView::DrawMessage(eMessageType Type, const char *Text)
     if (pixmapStatus) {
         ClearMessage();
     }
-    pixmapStatus = osd->CreatePixmap(5, cRect(0.1*osdWidth, 0.8*osdHeight, messageWidth, messageHeight));
+    pixmapStatus = osd->CreatePixmap(8, cRect(0.1*osdWidth, 0.8*osdHeight, messageWidth, messageHeight));
     pixmapStatus->Fill(col);
     cImageLoader imgLoader;
     imgLoader.DrawBackground2(Theme.Color(clrMenuBack), col, messageWidth-2, messageHeight-2);
diff --git a/displaymessage.c b/displaymessage.c
index 4b5fb47..780d17e 100644
--- a/displaymessage.c
+++ b/displaymessage.c
@@ -7,9 +7,12 @@ cNopacityDisplayMessage::cNopacityDisplayMessage(void) {
     width = cOsd::OsdWidth() * config.messageWidth / 100;
     int left = (cOsd::OsdLeft() + cOsd::OsdWidth() - width) / 2;
     osd = CreateOsd(left, top, width, height);
-    pixmap = osd->CreatePixmap(1, cRect(0, 0, width, height));
-    if (config.messageFadeTime)
+    pixmap = osd->CreatePixmap(2, cRect(0, 0, width, height));
+    pixmapBackground = osd->CreatePixmap(1, cRect(0, 0, width, height));
+    if (config.messageFadeTime) {
         pixmap->SetAlpha(0);
+        pixmapBackground->SetAlpha(0);
+    }
     font = cFont::CreateFont(config.fontName, height / 4 + 15 + config.fontMessage);
     FrameTime = config.messageFrameTime;
     FadeTime = config.messageFadeTime;
@@ -20,6 +23,7 @@ cNopacityDisplayMessage::~cNopacityDisplayMessage() {
     while (Active())
         cCondWait::SleepMs(10);
     osd->DestroyPixmap(pixmap);
+    osd->DestroyPixmap(pixmapBackground);
     delete font;
     delete osd;
 }
@@ -40,6 +44,7 @@ void cNopacityDisplayMessage::SetMessage(eMessageType Type, const char *Text) {
             col = Theme.Color(clrMessageError);
             break;
     }
+    pixmapBackground->Fill(clrBlack);
     pixmap->Fill(col);
     cImageLoader imgLoader;
     imgLoader.DrawBackground2(Theme.Color(clrMessageBlend), col, width-2, height-2);
@@ -61,6 +66,7 @@ void cNopacityDisplayMessage::Action(void) {
         cPixmap::Lock();
         double t = min(double(Now - Start) / FadeTime, 1.0);
         int Alpha = t * ALPHA_OPAQUE;
+        pixmapBackground->SetAlpha(Alpha);
         pixmap->SetAlpha(Alpha);
         if (Running())
             osd->Flush();
diff --git a/displaymessage.h b/displaymessage.h
index b287e33..d1ff5af 100644
--- a/displaymessage.h
+++ b/displaymessage.h
@@ -6,6 +6,7 @@ private:
     int width;
     int height;
     cPixmap *pixmap;
+    cPixmap *pixmapBackground;
     cFont *font;
     int FrameTime;
     int FadeTime;
diff --git a/icons/pluginIcons/Thumbs.db b/icons/pluginIcons/Thumbs.db
deleted file mode 100644
index 7fc5832..0000000
--- a/icons/pluginIcons/Thumbs.db
+++ /dev/null