Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
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-2-2
Commits
7fbedf14
Commit
7fbedf14
authored
Sep 29, 2013
by
David Fuhrmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
macosx: ensure that video view is always visible in fullscreen window (close #9526)
parent
854c894e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
0 deletions
+8
-0
modules/gui/macosx/Windows.h
modules/gui/macosx/Windows.h
+2
-0
modules/gui/macosx/Windows.m
modules/gui/macosx/Windows.m
+6
-0
No files found.
modules/gui/macosx/Windows.h
View file @
7fbedf14
...
@@ -105,6 +105,8 @@ static const float f_min_video_height = 70.0;
...
@@ -105,6 +105,8 @@ static const float f_min_video_height = 70.0;
BOOL
b_window_is_invisible
;
BOOL
b_window_is_invisible
;
NSInteger
i_originalLevel
;
NSInteger
i_originalLevel
;
BOOL
b_video_view_was_hidden
;
NSTimer
*
t_hide_mouse_timer
;
NSTimer
*
t_hide_mouse_timer
;
// true when the window is in transition for entering lion fullscreen
// true when the window is in transition for entering lion fullscreen
...
...
modules/gui/macosx/Windows.m
View file @
7fbedf14
...
@@ -813,6 +813,10 @@
...
@@ -813,6 +813,10 @@
return
;
return
;
}
}
/* Make sure video view gets visible in case the playlist was visible before */
b_video_view_was_hidden
=
[
o_video_view
isHidden
];
[
o_video_view
setHidden
:
NO
];
/* Make sure we don't see the o_video_view disappearing of the screen during this operation */
/* Make sure we don't see the o_video_view disappearing of the screen during this operation */
NSDisableScreenUpdates
();
NSDisableScreenUpdates
();
[
o_video_view
retain
];
[
o_video_view
retain
];
...
@@ -1017,6 +1021,8 @@
...
@@ -1017,6 +1021,8 @@
if
([[
o_video_view
subviews
]
count
]
>
0
)
if
([[
o_video_view
subviews
]
count
]
>
0
)
[
self
makeFirstResponder
:
[[
o_video_view
subviews
]
objectAtIndex
:
0
]];
[
self
makeFirstResponder
:
[[
o_video_view
subviews
]
objectAtIndex
:
0
]];
[
o_video_view
setHidden
:
b_video_view_was_hidden
];
[
super
makeKeyAndOrderFront
:
self
];
/* our version (in main window) contains a workaround */
[
super
makeKeyAndOrderFront
:
self
];
/* our version (in main window) contains a workaround */
[
o_fullscreen_window
orderOut
:
self
];
[
o_fullscreen_window
orderOut
:
self
];
...
...
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