Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-gpu
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-gpu
Commits
35265932
Commit
35265932
authored
Sep 29, 2013
by
Felix Paul Kühne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
macosx: ensure that video view is always visible in fullscreen window (close #9526)
Manual backport of 7fbedf14e
parent
40b797e6
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
0 deletions
+13
-0
modules/gui/macosx/MainWindow.m
modules/gui/macosx/MainWindow.m
+13
-0
No files found.
modules/gui/macosx/MainWindow.m
View file @
35265932
...
@@ -41,6 +41,12 @@
...
@@ -41,6 +41,12 @@
#import <vlc_services_discovery.h>
#import <vlc_services_discovery.h>
#import <vlc_aout_intf.h>
#import <vlc_aout_intf.h>
@interface
VLCMainWindow
()
{
BOOL
b_video_view_was_hidden
;
}
@end
@implementation
VLCMainWindow
@implementation
VLCMainWindow
static
const
float
f_min_video_height
=
70
.
0
;
static
const
float
f_min_video_height
=
70
.
0
;
...
@@ -2113,6 +2119,10 @@ static VLCMainWindow *_o_sharedInstance = nil;
...
@@ -2113,6 +2119,10 @@ static VLCMainWindow *_o_sharedInstance = nil;
{
{
b_fullscreen
=
NO
;
b_fullscreen
=
NO
;
/* 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
];
/* This function is private and should be only triggered at the end of the fullscreen change animation */
/* This function is private and should be only triggered at the end of the fullscreen change animation */
/* 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
();
...
@@ -2127,6 +2137,9 @@ static VLCMainWindow *_o_sharedInstance = nil;
...
@@ -2127,6 +2137,9 @@ static VLCMainWindow *_o_sharedInstance = nil;
[
super
makeKeyAndOrderFront
:
self
];
/* our version contains a workaround */
[
super
makeKeyAndOrderFront
:
self
];
/* our version contains a workaround */
else
else
[[
o_video_view
window
]
makeKeyAndOrderFront
:
self
];
[[
o_video_view
window
]
makeKeyAndOrderFront
:
self
];
[
o_video_view
setHidden
:
b_video_view_was_hidden
];
[
o_fullscreen_window
orderOut
:
self
];
[
o_fullscreen_window
orderOut
:
self
];
NSEnableScreenUpdates
();
NSEnableScreenUpdates
();
...
...
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