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
b095d5f2
Commit
b095d5f2
authored
Dec 28, 2007
by
Pierre d'Herbemont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MacOSX/Framework/VLCVideoView.m: Capitalize the s in FullScreen.
parent
7758266f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
24 additions
and
10 deletions
+24
-10
extras/MacOSX/Framework/Headers/Public/VLCVideoView.h
extras/MacOSX/Framework/Headers/Public/VLCVideoView.h
+2
-2
extras/MacOSX/Framework/Sources/VLCVideoView.m
extras/MacOSX/Framework/Sources/VLCVideoView.m
+22
-8
No files found.
extras/MacOSX/Framework/Headers/Public/VLCVideoView.h
View file @
b095d5f2
...
...
@@ -41,13 +41,13 @@ extern NSString * VLCVideoViewLeftFullScreen;
id
delegate
;
NSColor
*
backColor
;
BOOL
stretchesVideo
;
BOOL
full
s
creen
;
BOOL
full
S
creen
;
id
layoutManager
;
// TODO: Allow for view to report transparency to do some cool effects
// with the video?
}
@property
(
readonly
,
assign
)
BOOL
fulls
creen
;
@property
BOOL
fullS
creen
;
@property
BOOL
fillScreen
;
-
(
void
)
setDelegate
:(
id
)
value
;
...
...
extras/MacOSX/Framework/Sources/VLCVideoView.m
View file @
b095d5f2
...
...
@@ -59,10 +59,6 @@ NSString *VLCVideoViewLeftFullScreen = @"VLCVideoViewLeftFullScreen";
/******************************************************************************
* VLCVideoView (Private)
*/
@interface
VLCVideoView
()
/* Property */
@property
(
readwrite
,
assign
)
BOOL
fullscreen
;
@end
@interface
VLCVideoView
(
Private
)
/* Method */
...
...
@@ -141,7 +137,6 @@ NSString *VLCVideoViewLeftFullScreen = @"VLCVideoViewLeftFullScreen";
*/
@implementation
VLCVideoView
@synthesize
fullscreen
;
-
(
BOOL
)
fillScreen
{
...
...
@@ -153,6 +148,25 @@ NSString *VLCVideoViewLeftFullScreen = @"VLCVideoViewLeftFullScreen";
[[
self
layer
]
setNeedsLayout
];
}
-
(
BOOL
)
fullScreen
{
return
fullScreen
;
}
-
(
void
)
setFullScreen
:(
BOOL
)
newFullScreen
{
if
(
newFullScreen
)
{
fullScreen
=
YES
;
[
self
enterFullscreen
];
}
else
{
fullScreen
=
NO
;
[
self
leaveFullscreen
];
}
}
-
(
id
)
initWithFrame
:(
NSRect
)
rect
{
...
...
@@ -210,7 +224,7 @@ NSString *VLCVideoViewLeftFullScreen = @"VLCVideoViewLeftFullScreen";
withNotificationName:
VLCVideoViewEnteredFullScreen
];
[
super
enterFullScreenMode
:[[
self
window
]
screen
]
withOptions
:
nil
];
self
.
fulls
creen
=
YES
;
if
(
!
self
.
fullScreen
)
self
.
fullS
creen
=
YES
;
}
/* This is a LibVLC notification that we're about to enter leaving full screen,
...
...
@@ -224,7 +238,7 @@ NSString *VLCVideoViewLeftFullScreen = @"VLCVideoViewLeftFullScreen";
// There is nothing else to do, as this object strictly displays the video feed
[
super
exitFullScreenModeWithOptions
:
nil
];
self
.
fulls
creen
=
NO
;
if
(
self
.
fullScreen
)
self
.
fullS
creen
=
NO
;
}
-
(
void
)
drawRect
:(
NSRect
)
aRect
...
...
@@ -244,7 +258,7 @@ NSString *VLCVideoViewLeftFullScreen = @"VLCVideoViewLeftFullScreen";
{
if
([
theEvent
clickCount
]
!=
2
)
return
;
if
(
self
.
full
s
creen
)
if
(
self
.
full
S
creen
)
[
self
leaveFullscreen
];
else
[
self
enterFullscreen
];
...
...
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