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
ebd94835
Commit
ebd94835
authored
Jul 29, 2011
by
Sergey Radionov
Committed by
Rémi Denis-Courmont
Jul 30, 2011
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ActiveX: Added checking of correct using of fullscreen support.
Signed-off-by:
Rémi Denis-Courmont
<
remi@remlab.net
>
parent
55fe4f34
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
14 additions
and
1 deletion
+14
-1
projects/activex/vlc_win32_fullscreen.cpp
projects/activex/vlc_win32_fullscreen.cpp
+14
-1
No files found.
projects/activex/vlc_win32_fullscreen.cpp
View file @
ebd94835
...
...
@@ -844,17 +844,27 @@ void VLCWindowsManager::DestroyWindows()
void
VLCWindowsManager
::
LibVlcAttach
(
libvlc_media_player_t
*
p_md
)
{
if
(
!
_HolderWnd
)
return
;
//VLCWindowsManager::CreateWindows was not called
_p_md
=
p_md
;
libvlc_media_player_set_hwnd
(
p_md
,
_HolderWnd
->
getHWND
());
}
void
VLCWindowsManager
::
LibVlcDetach
()
{
if
(
_p_md
){
libvlc_media_player_set_hwnd
(
_p_md
,
0
);
}
_p_md
=
0
;
}
void
VLCWindowsManager
::
StartFullScreen
()
{
if
(
!
_HolderWnd
)
return
;
//VLCWindowsManager::CreateWindows was not called
if
(
getMD
()
&&!
IsFullScreen
()){
if
(
!
_FSWnd
){
_FSWnd
=
VLCFullScreenWnd
::
CreateFSWindow
(
this
);
...
...
@@ -871,6 +881,9 @@ void VLCWindowsManager::StartFullScreen()
void
VLCWindowsManager
::
EndFullScreen
()
{
if
(
!
_HolderWnd
)
return
;
//VLCWindowsManager::CreateWindows was not called
if
(
IsFullScreen
()){
SetParent
(
_HolderWnd
->
getHWND
(),
_hWindowedParentWnd
);
...
...
@@ -900,5 +913,5 @@ void VLCWindowsManager::ToggleFullScreen()
bool
VLCWindowsManager
::
IsFullScreen
()
{
return
0
!=
_FSWnd
&&
GetParent
(
_HolderWnd
->
getHWND
())
==
_FSWnd
->
getHWND
();
return
0
!=
_FSWnd
&&
0
!=
_HolderWnd
&&
GetParent
(
_HolderWnd
->
getHWND
())
==
_FSWnd
->
getHWND
();
}
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