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
510f5629
Commit
510f5629
authored
Jun 14, 2003
by
Gildas Bazin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* modules/gui/skins/x11/x11_window.cpp: small bugfix for icons support.
parent
a1f11b40
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
modules/gui/skins/src/skin_main.cpp
modules/gui/skins/src/skin_main.cpp
+2
-2
modules/gui/skins/x11/x11_window.cpp
modules/gui/skins/x11/x11_window.cpp
+3
-3
No files found.
modules/gui/skins/src/skin_main.cpp
View file @
510f5629
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
* skin-main.cpp: skins plugin for VLC
* skin-main.cpp: skins plugin for VLC
*****************************************************************************
*****************************************************************************
* Copyright (C) 2003 VideoLAN
* Copyright (C) 2003 VideoLAN
* $Id: skin_main.cpp,v 1.
39 2003/06/13 21:18:53 asmax
Exp $
* $Id: skin_main.cpp,v 1.
40 2003/06/14 18:49:02 gbazin
Exp $
*
*
* Authors: Olivier Teulire <ipkiss@via.ecp.fr>
* Authors: Olivier Teulire <ipkiss@via.ecp.fr>
* Emmanuel Puig <karibu@via.ecp.fr>
* Emmanuel Puig <karibu@via.ecp.fr>
...
@@ -167,7 +167,7 @@ static int Open ( vlc_object_t *p_this )
...
@@ -167,7 +167,7 @@ static int Open ( vlc_object_t *p_this )
imlib_render_pixmaps_for_whole_image
(
&
p_intf
->
p_sys
->
iconPixmap
,
imlib_render_pixmaps_for_whole_image
(
&
p_intf
->
p_sys
->
iconPixmap
,
&
p_intf
->
p_sys
->
iconMask
);
&
p_intf
->
p_sys
->
iconMask
);
imlib_free_image
();
imlib_free_image
();
}
}
#elif defined WIN32
#elif defined WIN32
...
...
modules/gui/skins/x11/x11_window.cpp
View file @
510f5629
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
* x11_window.cpp: X11 implementation of the Window class
* x11_window.cpp: X11 implementation of the Window class
*****************************************************************************
*****************************************************************************
* Copyright (C) 2003 VideoLAN
* Copyright (C) 2003 VideoLAN
* $Id: x11_window.cpp,v 1.2
2 2003/06/13 21:18:54 asmax
Exp $
* $Id: x11_window.cpp,v 1.2
3 2003/06/14 18:49:02 gbazin
Exp $
*
*
* Authors: Cyril Deguet <asmax@videolan.org>
* Authors: Cyril Deguet <asmax@videolan.org>
*
*
...
@@ -102,12 +102,12 @@ X11Window::X11Window( intf_thread_t *p_intf, Window wnd, int x, int y,
...
@@ -102,12 +102,12 @@ X11Window::X11Window( intf_thread_t *p_intf, Window wnd, int x, int y,
{
{
hints
=
XAllocWMHints
();
hints
=
XAllocWMHints
();
}
}
if
(
hints
->
icon_p
ixmap
!=
None
)
if
(
p_intf
->
p_sys
->
iconP
ixmap
!=
None
)
{
{
hints
->
icon_pixmap
=
p_intf
->
p_sys
->
iconPixmap
;
hints
->
icon_pixmap
=
p_intf
->
p_sys
->
iconPixmap
;
hints
->
flags
|=
IconPixmapHint
;
hints
->
flags
|=
IconPixmapHint
;
}
}
if
(
hints
->
icon_m
ask
!=
None
)
if
(
p_intf
->
p_sys
->
iconM
ask
!=
None
)
{
{
hints
->
icon_mask
=
p_intf
->
p_sys
->
iconMask
;
hints
->
icon_mask
=
p_intf
->
p_sys
->
iconMask
;
hints
->
flags
|=
IconMaskHint
;
hints
->
flags
|=
IconMaskHint
;
...
...
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