Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
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
Commits
138034ae
Commit
138034ae
authored
Feb 15, 2013
by
David Fuhrmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
macosx: deduplicate code for fullscreen presentation options
parent
6c1ae0ff
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
19 deletions
+13
-19
modules/gui/macosx/VLCVoutWindowController.m
modules/gui/macosx/VLCVoutWindowController.m
+0
-1
modules/gui/macosx/Windows.m
modules/gui/macosx/Windows.m
+2
-12
modules/gui/macosx/misc.m
modules/gui/macosx/misc.m
+11
-6
No files found.
modules/gui/macosx/VLCVoutWindowController.m
View file @
138034ae
...
@@ -305,5 +305,4 @@
...
@@ -305,5 +305,4 @@
@synthesize
currentWindowLevel
=
i_currentWindowLevel
;
@synthesize
currentWindowLevel
=
i_currentWindowLevel
;
@end
@end
modules/gui/macosx/Windows.m
View file @
138034ae
...
@@ -786,12 +786,7 @@
...
@@ -786,12 +786,7 @@
CGDisplayFade
(
token
,
0
.
5
,
kCGDisplayBlendNormal
,
kCGDisplayBlendSolidColor
,
0
,
0
,
0
,
YES
);
CGDisplayFade
(
token
,
0
.
5
,
kCGDisplayBlendNormal
,
kCGDisplayBlendSolidColor
,
0
,
0
,
0
,
YES
);
}
}
NSApplicationPresentationOptions
presentationOpts
=
[
NSApp
presentationOptions
];
[
screen
setFullscreenPresentationOptions
];
if
([
screen
hasMenuBar
])
presentationOpts
|=
NSApplicationPresentationAutoHideMenuBar
;
if
([
screen
hasMenuBar
]
||
[
screen
hasDock
])
presentationOpts
|=
NSApplicationPresentationAutoHideDock
;
[
NSApp
setPresentationOptions
:
presentationOpts
];
[[
o_video_view
superview
]
replaceSubview
:
o_video_view
with
:
o_temp_view
];
[[
o_video_view
superview
]
replaceSubview
:
o_video_view
with
:
o_temp_view
];
[
o_temp_view
setFrame
:[
o_video_view
frame
]];
[
o_temp_view
setFrame
:[
o_video_view
frame
]];
...
@@ -841,12 +836,7 @@
...
@@ -841,12 +836,7 @@
[
o_fullscreen_anim2
release
];
[
o_fullscreen_anim2
release
];
}
}
NSApplicationPresentationOptions
presentationOpts
=
[
NSApp
presentationOptions
];
[
screen
setFullscreenPresentationOptions
];
if
([
screen
hasMenuBar
])
presentationOpts
|=
NSApplicationPresentationAutoHideMenuBar
;
if
([
screen
hasMenuBar
]
||
[
screen
hasDock
])
presentationOpts
|=
NSApplicationPresentationAutoHideDock
;
[
NSApp
setPresentationOptions
:
presentationOpts
];
dict1
=
[[
NSMutableDictionary
alloc
]
initWithCapacity
:
2
];
dict1
=
[[
NSMutableDictionary
alloc
]
initWithCapacity
:
2
];
dict2
=
[[
NSMutableDictionary
alloc
]
initWithCapacity
:
3
];
dict2
=
[[
NSMutableDictionary
alloc
]
initWithCapacity
:
3
];
...
...
modules/gui/macosx/misc.m
View file @
138034ae
...
@@ -246,12 +246,7 @@ static NSMutableArray *blackoutWindows = NULL;
...
@@ -246,12 +246,7 @@ static NSMutableArray *blackoutWindows = NULL;
[
blackoutWindows
addObject
:
blackoutWindow
];
[
blackoutWindows
addObject
:
blackoutWindow
];
[
blackoutWindow
release
];
[
blackoutWindow
release
];
NSApplicationPresentationOptions
presentationOpts
=
[
NSApp
presentationOptions
];
[
screen
setFullscreenPresentationOptions
];
if
([
screen
hasMenuBar
])
presentationOpts
|=
NSApplicationPresentationAutoHideMenuBar
;
if
([
screen
hasMenuBar
]
||
[
screen
hasDock
])
presentationOpts
|=
NSApplicationPresentationAutoHideDock
;
[
NSApp
setPresentationOptions
:
presentationOpts
];
}
}
}
}
...
@@ -267,6 +262,16 @@ static NSMutableArray *blackoutWindows = NULL;
...
@@ -267,6 +262,16 @@ static NSMutableArray *blackoutWindows = NULL;
[
NSApp
setPresentationOptions
:(
NSApplicationPresentationDefault
)];
[
NSApp
setPresentationOptions
:(
NSApplicationPresentationDefault
)];
}
}
-
(
void
)
setFullscreenPresentationOptions
{
NSApplicationPresentationOptions
presentationOpts
=
[
NSApp
presentationOptions
];
if
([
self
hasMenuBar
])
presentationOpts
|=
NSApplicationPresentationAutoHideMenuBar
;
if
([
self
hasMenuBar
]
||
[
self
hasDock
])
presentationOpts
|=
NSApplicationPresentationAutoHideDock
;
[
NSApp
setPresentationOptions
:
presentationOpts
];
}
@end
@end
/*****************************************************************************
/*****************************************************************************
...
...
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