[vlc-commits] commit: Win32: fix transparency on Win7 taskbar buttons (Geoffroy Couprie )

[git at videolan.org]

vlc/vlc-1.1 | branch: master | Geoffroy Couprie <geal at videolan.org> | Tue Jun 15 23:04:07 2010 +0200| [b2096f74334eaf1043d00396e097412a99ff5847] | committer: Geoffroy Couprie 

Win32: fix transparency on Win7 taskbar buttons

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.1.git/?a=commit;h=b2096f74334eaf1043d00396e097412a99ff5847
---

 modules/gui/qt4/Modules.am               |    4 ++++
 modules/gui/qt4/main_interface_win32.cpp |   16 ++++++++--------
 modules/gui/qt4/vlc.qrc                  |    6 ++++++
 3 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/modules/gui/qt4/Modules.am b/modules/gui/qt4/Modules.am
index 743956b..99feeae 100644
--- a/modules/gui/qt4/Modules.am
+++ b/modules/gui/qt4/Modules.am
@@ -183,6 +183,10 @@ DEPS_res = \
 	pixmaps/types/type_node.png \
 	pixmaps/types/type_playlist.png \
 	pixmaps/types/type_unknown.xpm \
+	pixmaps/win7/win7thumbnail_prev.png \
+	pixmaps/win7/win7thumbnail_next.png \
+	pixmaps/win7/win7thumbnail_play.png \
+	pixmaps/win7/win7thumbnail_pause.png \
 	pixmaps/update.png \
 	pixmaps/lock.png
 
diff --git a/modules/gui/qt4/main_interface_win32.cpp b/modules/gui/qt4/main_interface_win32.cpp
index 4dce735..ddc6c1c 100644
--- a/modules/gui/qt4/main_interface_win32.cpp
+++ b/modules/gui/qt4/main_interface_win32.cpp
@@ -87,17 +87,17 @@ void MainInterface::createTaskBarButtons()
     {
         p_taskbl->vt->HrInit(p_taskbl);
 
-        if(himl = ImageList_Create( 15, //cx
-                        18, //cy
-                        ILC_COLOR,//flags
+        if(himl = ImageList_Create( 20, //cx
+                        20, //cy
+                        ILC_COLOR32,//flags
                         4,//initial nb of images
                         0//nb of images that can be added
                         ))
         {
-            QPixmap img   = QPixmap(":/toolbar/previous_b");
-            QPixmap img2  = QPixmap(":/toolbar/pause_b");
-            QPixmap img3  = QPixmap(":/toolbar/play_b");
-            QPixmap img4  = QPixmap(":/toolbar/next_b");
+            QPixmap img   = QPixmap(":/win7/prev");
+            QPixmap img2  = QPixmap(":/win7/pause");
+            QPixmap img3  = QPixmap(":/win7/play");
+            QPixmap img4  = QPixmap(":/win7/next");
             QBitmap mask  = img.createMaskFromColor(Qt::transparent);
             QBitmap mask2 = img2.createMaskFromColor(Qt::transparent);
             QBitmap mask3 = img3.createMaskFromColor(Qt::transparent);
@@ -156,7 +156,7 @@ bool MainInterface::winEvent ( MSG * msg, long * result )
 {
     if (msg->message == taskbar_wmsg)
     {
-        //We received the taskbarbuttoncreated, now we can really create th buttons
+        //We received the "taskbarbuttoncreated" message, now we can really create the buttons
         createTaskBarButtons();
     }
 
diff --git a/modules/gui/qt4/vlc.qrc b/modules/gui/qt4/vlc.qrc
index ec17357..2530f8f 100644
--- a/modules/gui/qt4/vlc.qrc
+++ b/modules/gui/qt4/vlc.qrc
@@ -109,4 +109,10 @@
         <file alias="sout" >pixmaps/prefs/advprefs_sout.png</file>
         <file alias="video" >pixmaps/prefs/advprefs_video.png</file>
     </qresource>
+    <qresource prefix="/win7" >
+        <file alias="prev" >pixmaps/win7/win7thumbnail_prev.png</file>
+        <file alias="next" >pixmaps/win7/win7thumbnail_next.png</file>
+        <file alias="play" >pixmaps/win7/win7thumbnail_play.png</file>
+        <file alias="pause" >pixmaps/win7/win7thumbnail_pause.png</file>
+    </qresource>
 </RCC>