Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-1.1
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-1.1
Commits
b2096f74
Commit
b2096f74
authored
Jun 15, 2010
by
Geoffroy Couprie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Win32: fix transparency on Win7 taskbar buttons
parent
553c35a7
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
18 additions
and
8 deletions
+18
-8
modules/gui/qt4/Modules.am
modules/gui/qt4/Modules.am
+4
-0
modules/gui/qt4/main_interface_win32.cpp
modules/gui/qt4/main_interface_win32.cpp
+8
-8
modules/gui/qt4/vlc.qrc
modules/gui/qt4/vlc.qrc
+6
-0
No files found.
modules/gui/qt4/Modules.am
View file @
b2096f74
...
@@ -183,6 +183,10 @@ DEPS_res = \
...
@@ -183,6 +183,10 @@ DEPS_res = \
pixmaps/types/type_node.png \
pixmaps/types/type_node.png \
pixmaps/types/type_playlist.png \
pixmaps/types/type_playlist.png \
pixmaps/types/type_unknown.xpm \
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/update.png \
pixmaps/lock.png
pixmaps/lock.png
...
...
modules/gui/qt4/main_interface_win32.cpp
View file @
b2096f74
...
@@ -87,17 +87,17 @@ void MainInterface::createTaskBarButtons()
...
@@ -87,17 +87,17 @@ void MainInterface::createTaskBarButtons()
{
{
p_taskbl
->
vt
->
HrInit
(
p_taskbl
);
p_taskbl
->
vt
->
HrInit
(
p_taskbl
);
if
(
himl
=
ImageList_Create
(
15
,
//cx
if
(
himl
=
ImageList_Create
(
20
,
//cx
18
,
//cy
20
,
//cy
ILC_COLOR
,
//flags
ILC_COLOR
32
,
//flags
4
,
//initial nb of images
4
,
//initial nb of images
0
//nb of images that can be added
0
//nb of images that can be added
))
))
{
{
QPixmap
img
=
QPixmap
(
":/
toolbar/previous_b
"
);
QPixmap
img
=
QPixmap
(
":/
win7/prev
"
);
QPixmap
img2
=
QPixmap
(
":/
toolbar/pause_b
"
);
QPixmap
img2
=
QPixmap
(
":/
win7/pause
"
);
QPixmap
img3
=
QPixmap
(
":/
toolbar/play_b
"
);
QPixmap
img3
=
QPixmap
(
":/
win7/play
"
);
QPixmap
img4
=
QPixmap
(
":/
toolbar/next_b
"
);
QPixmap
img4
=
QPixmap
(
":/
win7/next
"
);
QBitmap
mask
=
img
.
createMaskFromColor
(
Qt
::
transparent
);
QBitmap
mask
=
img
.
createMaskFromColor
(
Qt
::
transparent
);
QBitmap
mask2
=
img2
.
createMaskFromColor
(
Qt
::
transparent
);
QBitmap
mask2
=
img2
.
createMaskFromColor
(
Qt
::
transparent
);
QBitmap
mask3
=
img3
.
createMaskFromColor
(
Qt
::
transparent
);
QBitmap
mask3
=
img3
.
createMaskFromColor
(
Qt
::
transparent
);
...
@@ -156,7 +156,7 @@ bool MainInterface::winEvent ( MSG * msg, long * result )
...
@@ -156,7 +156,7 @@ bool MainInterface::winEvent ( MSG * msg, long * result )
{
{
if
(
msg
->
message
==
taskbar_wmsg
)
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
();
createTaskBarButtons
();
}
}
...
...
modules/gui/qt4/vlc.qrc
View file @
b2096f74
...
@@ -109,4 +109,10 @@
...
@@ -109,4 +109,10 @@
<file alias="sout" >pixmaps/prefs/advprefs_sout.png</file>
<file alias="sout" >pixmaps/prefs/advprefs_sout.png</file>
<file alias="video" >pixmaps/prefs/advprefs_video.png</file>
<file alias="video" >pixmaps/prefs/advprefs_video.png</file>
</qresource>
</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>
</RCC>
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment