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
60296be1
Commit
60296be1
authored
Mar 01, 2012
by
Felix Paul Kühne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
macosx: don't let the video window get larger than the screen it is on (close #5875)
(cherry picked from commit
93b21142
)
parent
6f30aac6
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
0 deletions
+7
-0
modules/video_output/macosx.m
modules/video_output/macosx.m
+7
-0
No files found.
modules/video_output/macosx.m
View file @
60296be1
...
...
@@ -356,6 +356,7 @@ static int Control (vout_display_t *vd, int query, va_list ap)
NSRect
windowFrame
=
[
o_window
frame
];
NSRect
glViewFrame
=
[
sys
->
glView
frame
];
NSSize
windowMinSize
=
[
o_window
minSize
];
NSSize
windowMaxSize
=
[
o_window
constrainFrameRect
:
windowFrame
toScreen
:
[
o_window
screen
]].
size
;
topleftbase
.
x
=
0
;
topleftbase
.
y
=
windowFrame
.
size
.
height
;
...
...
@@ -370,6 +371,12 @@ static int Control (vout_display_t *vd, int query, va_list ap)
if
(
i_height
<
windowMinSize
.
height
)
i_height
=
windowMinSize
.
height
;
/* don't make the window than its screen */
if
(
i_width
>
windowMaxSize
.
width
)
i_width
=
windowMaxSize
.
width
;
if
(
i_height
>
windowMaxSize
.
height
)
i_height
=
windowMaxSize
.
height
;
if
(
i_height
!=
glViewFrame
.
size
.
height
||
i_width
!=
glViewFrame
.
size
.
width
)
{
new_frame
.
size
.
width
=
windowFrame
.
size
.
width
-
glViewFrame
.
size
.
width
+
i_width
;
...
...
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