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
a16d7de0
Commit
a16d7de0
authored
Aug 24, 2012
by
Felix Paul Kühne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
macosx/MainWindow: modernize getter
parent
0d05deab
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
modules/gui/macosx/MainWindow.h
modules/gui/macosx/MainWindow.h
+2
-2
modules/gui/macosx/MainWindow.m
modules/gui/macosx/MainWindow.m
+1
-1
modules/gui/macosx/VideoView.m
modules/gui/macosx/VideoView.m
+1
-1
No files found.
modules/gui/macosx/MainWindow.h
View file @
a16d7de0
...
...
@@ -146,6 +146,7 @@
id
o_current_video_window
;
}
+
(
VLCMainWindow
*
)
sharedInstance
;
@property
(
readonly
)
BOOL
fullscreen
;
-
(
IBAction
)
play
:(
id
)
sender
;
-
(
IBAction
)
prev
:(
id
)
sender
;
...
...
@@ -165,7 +166,7 @@
-
(
IBAction
)
dropzoneButtonAction
:(
id
)
sender
;
-
(
void
)
setTitle
:(
NSString
*
)
title
;
-
(
void
)
customZoom
:(
id
)
sender
;
-
(
void
)
customZoom
:(
id
)
sender
;
-
(
void
)
windowResizedOrMoved
:(
NSNotification
*
)
notification
;
-
(
void
)
showDropZone
;
...
...
@@ -198,7 +199,6 @@
/* fullscreen handling */
-
(
void
)
showFullscreenController
;
-
(
BOOL
)
isFullscreen
;
-
(
void
)
lockFullscreenAnimation
;
-
(
void
)
unlockFullscreenAnimation
;
-
(
void
)
enterFullscreen
;
...
...
modules/gui/macosx/MainWindow.m
View file @
a16d7de0
...
...
@@ -2043,7 +2043,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
[
o_fspanel
fadeIn
];
}
-
(
BOOL
)
isF
ullscreen
-
(
BOOL
)
f
ullscreen
{
return
b_fullscreen
;
}
...
...
modules/gui/macosx/VideoView.m
View file @
a16d7de0
...
...
@@ -268,7 +268,7 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
// This is the result of [NSEvent standardMagnificationThreshold].
// Unfortunately, this is a private API, currently.
CGFloat
f_threshold
=
0
.
3
;
BOOL
b_fullscreen
=
[[
VLCMainWindow
sharedInstance
]
isF
ullscreen
];
BOOL
b_fullscreen
=
[[
VLCMainWindow
sharedInstance
]
f
ullscreen
];
if
(
(
f_cumulated_magnification
>
f_threshold
&&
!
b_fullscreen
)
||
(
f_cumulated_magnification
<
-
f_threshold
&&
b_fullscreen
)
)
{
...
...
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