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
9375a0d8
Commit
9375a0d8
authored
May 11, 2007
by
Pierre d'Herbemont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Mac OS X gui: Make sure maximized window respect Mac OS X Dock area. (Fix #1190)
parent
2b602203
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
21 deletions
+3
-21
modules/gui/macosx/embeddedwindow.h
modules/gui/macosx/embeddedwindow.h
+0
-2
modules/gui/macosx/embeddedwindow.m
modules/gui/macosx/embeddedwindow.m
+3
-19
No files found.
modules/gui/macosx/embeddedwindow.h
View file @
9375a0d8
...
...
@@ -42,8 +42,6 @@
NSImage
*
o_img_pause
;
NSImage
*
o_img_pause_pressed
;
NSRect
o_saved_frame
;
VLCWindow
*
o_fullscreen_window
;
NSViewAnimation
*
o_fullscreen_anim1
;
NSViewAnimation
*
o_fullscreen_anim2
;
...
...
modules/gui/macosx/embeddedwindow.m
View file @
9375a0d8
...
...
@@ -55,8 +55,6 @@
o_img_pause
=
[
NSImage
imageNamed
:
@"pause_embedded"
];
o_img_pause_pressed
=
[
NSImage
imageNamed
:
@"pause_embedded_blue"
];
o_saved_frame
=
NSMakeRect
(
0
.
0
f
,
0
.
0
f
,
0
.
0
f
,
0
.
0
f
);
/* Useful to save o_view frame in fullscreen mode */
o_temp_view
=
[[
NSView
alloc
]
init
];
[
o_temp_view
setAutoresizingMask
:
NSViewHeightSizable
|
NSViewWidthSizable
];
...
...
@@ -103,24 +101,10 @@
[
o_slider
setEnabled
:
b_seekable
];
}
-
(
void
)
zoom
:(
id
)
sender
-
(
BOOL
)
windowShouldZoom
:(
NSWindow
*
)
sender
toFrame
:(
NSRect
)
newFrame
{
if
(
!
[
self
isZoomed
]
)
{
NSRect
zoomRect
=
[[
self
screen
]
frame
];
o_saved_frame
=
[
self
frame
];
/* we don't have to take care of the eventual menu bar and dock
as zoomRect will be cropped automatically by setFrame:display:
to the right rectangle */
[
self
setFrame
:
zoomRect
display
:
YES
animate
:
YES
];
}
else
{
/* unzoom to the saved_frame if the o_saved_frame coords look sound
(just in case) */
if
(
o_saved_frame
.
size
.
width
>
0
&&
o_saved_frame
.
size
.
height
>
0
)
[
self
setFrame
:
o_saved_frame
display
:
YES
animate
:
YES
];
}
[
self
setFrame
:
newFrame
display
:
YES
animate
:
YES
];
return
YES
;
}
-
(
BOOL
)
windowShouldClose
:(
id
)
sender
...
...
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