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
304a1c0a
Commit
304a1c0a
authored
Jul 23, 2012
by
David Fuhrmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
macosx vout: don't reset window state on close here
parent
d781f87d
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
modules/gui/macosx/MainWindow.m
modules/gui/macosx/MainWindow.m
+3
-0
modules/video_output/macosx.m
modules/video_output/macosx.m
+0
-3
No files found.
modules/gui/macosx/MainWindow.m
View file @
304a1c0a
...
@@ -1807,6 +1807,9 @@ static VLCMainWindow *_o_sharedInstance = nil;
...
@@ -1807,6 +1807,9 @@ static VLCMainWindow *_o_sharedInstance = nil;
[
self
makeFirstResponder
:
nil
];
[
self
makeFirstResponder
:
nil
];
[
o_detached_video_window
orderOut
:
nil
];
[
o_detached_video_window
orderOut
:
nil
];
if
(
[
self
level
]
!=
NSNormalWindowLevel
)
[
self
setLevel
:
NSNormalWindowLevel
];
// restore alpha value to 1 for the case that macosx-opaqueness is set to < 1
// restore alpha value to 1 for the case that macosx-opaqueness is set to < 1
[
self
setAlphaValue
:
1
.
0
];
[
self
setAlphaValue
:
1
.
0
];
}
}
...
...
modules/video_output/macosx.m
View file @
304a1c0a
...
@@ -268,9 +268,6 @@ void Close (vlc_object_t *this)
...
@@ -268,9 +268,6 @@ void Close (vlc_object_t *this)
vout_display_t
*
vd
=
(
vout_display_t
*
)
this
;
vout_display_t
*
vd
=
(
vout_display_t
*
)
this
;
vout_display_sys_t
*
sys
=
vd
->
sys
;
vout_display_sys_t
*
sys
=
vd
->
sys
;
if
([[
sys
->
glView
window
]
level
]
!=
NSNormalWindowLevel
)
[[
sys
->
glView
window
]
setLevel
:
NSNormalWindowLevel
];
[
sys
->
glView
setVoutDisplay
:
nil
];
[
sys
->
glView
setVoutDisplay
:
nil
];
var_Destroy
(
vd
,
"drawable-nsobject"
);
var_Destroy
(
vd
,
"drawable-nsobject"
);
...
...
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