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
4b23d65e
Commit
4b23d65e
authored
Oct 06, 2012
by
David Fuhrmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
macosx: add black view to detached video view in order to avoid flashes
parent
9346a542
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
19 additions
and
1 deletion
+19
-1
modules/gui/macosx/MainWindow.h
modules/gui/macosx/MainWindow.h
+3
-0
modules/gui/macosx/MainWindow.m
modules/gui/macosx/MainWindow.m
+16
-1
No files found.
modules/gui/macosx/MainWindow.h
View file @
4b23d65e
...
@@ -159,5 +159,8 @@
...
@@ -159,5 +159,8 @@
@end
@end
@interface
VLCDetachedVideoWindow
:
VLCVideoWindowCommon
@interface
VLCDetachedVideoWindow
:
VLCVideoWindowCommon
{
VLCColorView
*
o_color_backdrop
;
}
@end
@end
\ No newline at end of file
modules/gui/macosx/MainWindow.m
View file @
4b23d65e
...
@@ -1762,8 +1762,9 @@ static VLCMainWindow *_o_sharedInstance = nil;
...
@@ -1762,8 +1762,9 @@ static VLCMainWindow *_o_sharedInstance = nil;
{
{
[
self
setAcceptsMouseMovedEvents
:
YES
];
[
self
setAcceptsMouseMovedEvents
:
YES
];
[
self
setBackgroundColor
:
[
NSColor
blackColor
]];
if
(
b_dark_interface
)
{
if
(
b_dark_interface
)
{
[
self
setBackgroundColor
:
[
NSColor
clearColor
]];
[
self
setOpaque
:
NO
];
[
self
setOpaque
:
NO
];
[
self
display
];
[
self
display
];
[
self
setHasShadow
:
NO
];
[
self
setHasShadow
:
NO
];
...
@@ -1778,6 +1779,8 @@ static VLCMainWindow *_o_sharedInstance = nil;
...
@@ -1778,6 +1779,8 @@ static VLCMainWindow *_o_sharedInstance = nil;
// native fs not supported with detached view yet
// native fs not supported with detached view yet
[
o_titlebar_view
setFullscreenButtonHidden
:
YES
];
[
o_titlebar_view
setFullscreenButtonHidden
:
YES
];
}
else
{
[
self
setBackgroundColor
:
[
NSColor
blackColor
]];
}
}
NSRect
videoViewRect
=
[[
self
contentView
]
bounds
];
NSRect
videoViewRect
=
[[
self
contentView
]
bounds
];
...
@@ -1789,10 +1792,22 @@ static VLCMainWindow *_o_sharedInstance = nil;
...
@@ -1789,10 +1792,22 @@ static VLCMainWindow *_o_sharedInstance = nil;
[
o_video_view
setFrame
:
videoViewRect
];
[
o_video_view
setFrame
:
videoViewRect
];
if
(
b_dark_interface
)
{
if
(
b_dark_interface
)
{
o_color_backdrop
=
[[
VLCColorView
alloc
]
initWithFrame
:
[
o_video_view
frame
]];
[[
self
contentView
]
addSubview
:
o_color_backdrop
positioned
:
NSWindowBelow
relativeTo
:
o_video_view
];
[
o_color_backdrop
setAutoresizingMask
:
NSViewHeightSizable
|
NSViewWidthSizable
];
[
self
setContentMinSize
:
NSMakeSize
(
363
.,
f_min_video_height
+
[[[
self
controlsBar
]
bottomBarView
]
frame
].
size
.
height
+
[
o_titlebar_view
frame
].
size
.
height
)];
[
self
setContentMinSize
:
NSMakeSize
(
363
.,
f_min_video_height
+
[[[
self
controlsBar
]
bottomBarView
]
frame
].
size
.
height
+
[
o_titlebar_view
frame
].
size
.
height
)];
}
else
{
}
else
{
[
self
setContentMinSize
:
NSMakeSize
(
363
.,
f_min_video_height
+
[[[
self
controlsBar
]
bottomBarView
]
frame
].
size
.
height
)];
[
self
setContentMinSize
:
NSMakeSize
(
363
.,
f_min_video_height
+
[[[
self
controlsBar
]
bottomBarView
]
frame
].
size
.
height
)];
}
}
}
}
-
(
void
)
dealloc
{
if
(
b_dark_interface
)
[
o_color_backdrop
release
];
[
super
dealloc
];
}
@end
@end
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