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
6e56b492
Commit
6e56b492
authored
Aug 09, 2012
by
Felix Paul Kühne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
macosx: disable virtually all CoreAnimation effects in the main window on Leopard (close #7047)
parent
95ab33bd
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
41 additions
and
18 deletions
+41
-18
extras/package/macosx/Resources/English.lproj/MainMenu.xib
extras/package/macosx/Resources/English.lproj/MainMenu.xib
+12
-10
modules/gui/macosx/MainWindow.m
modules/gui/macosx/MainWindow.m
+29
-8
No files found.
extras/package/macosx/Resources/English.lproj/MainMenu.xib
View file @
6e56b492
...
...
@@ -2,7 +2,7 @@
<archive
type=
"com.apple.InterfaceBuilder3.Cocoa.XIB"
version=
"7.10"
>
<data>
<int
key=
"IBDocument.SystemTarget"
>
1050
</int>
<string
key=
"IBDocument.SystemVersion"
>
11
E53
</string>
<string
key=
"IBDocument.SystemVersion"
>
11
G15
</string>
<string
key=
"IBDocument.InterfaceBuilderVersion"
>
851
</string>
<string
key=
"IBDocument.AppKitVersion"
>
1138.47
</string>
<string
key=
"IBDocument.HIToolboxVersion"
>
569.00
</string>
...
...
@@ -21,15 +21,16 @@
</object>
<object
class=
"NSMutableArray"
key=
"IBDocument.EditedObjectIDs"
>
<bool
key=
"EncodedWithXMLCoder"
>
YES
</bool>
<integer
value=
"2770"
/>
<integer
value=
"2730"
/>
<integer
value=
"4948"
/>
<integer
value=
"29"
/>
<integer
value=
"1617"
/>
<integer
value=
"21"
/>
<integer
value=
"4845"
/>
<integer
value=
"4722"
/>
<integer
value=
"1617"
/>
<integer
value=
"4850"
/>
<integer
value=
"4756"
/>
<integer
value=
"915"
/>
<integer
value=
"29"
/>
<integer
value=
"2770"
/>
<integer
value=
"4948"
/>
<integer
value=
"2730"
/>
</object>
<object
class=
"NSArray"
key=
"IBDocument.PluginDependencies"
>
<bool
key=
"EncodedWithXMLCoder"
>
YES
</bool>
...
...
@@ -513,7 +514,6 @@
</object>
<string
key=
"NSFrame"
>
{{201, 0}, {403, 274}}
</string>
<reference
key=
"NSSuperview"
ref=
"302568132"
/>
<bool
key=
"NSViewIsLayerTreeHost"
>
YES
</bool>
<int
key=
"NSViewLayerContentsRedrawPolicy"
>
2
</int>
<string
key=
"NSClassName"
>
NSView
</string>
</object>
...
...
@@ -4430,7 +4430,6 @@ LCAuLi4</string>
</object>
<string
key=
"NSFrameSize"
>
{402, 252}
</string>
<reference
key=
"NSSuperview"
/>
<bool
key=
"NSViewIsLayerTreeHost"
>
YES
</bool>
<object
class=
"CIDarkenBlendMode"
key=
"NSViewCompositeFilter"
>
<bool
key=
"CIEnabled"
>
YES
</bool>
</object>
...
...
@@ -4438,9 +4437,10 @@ LCAuLi4</string>
<string
key=
"NSClassName"
>
VLCMainWindowTitleView
</string>
</object>
<object
class=
"NSCustomView"
id=
"767040302"
>
<
nil
key=
"NSNextResponder"
/>
<
reference
key=
"NSNextResponder"
/>
<int
key=
"NSvFlags"
>
256
</int>
<string
key=
"NSFrameSize"
>
{100, 100}
</string>
<reference
key=
"NSSuperview"
/>
<string
key=
"NSClassName"
>
NSView
</string>
</object>
<object
class=
"NSDrawer"
id=
"689081542"
>
...
...
@@ -11830,6 +11830,7 @@ LCAuLi4</string>
<string>
4839.IBPluginDependency
</string>
<string>
4839.IBViewBoundsToFrameTransform
</string>
<string>
4840.IBPluginDependency
</string>
<string>
4845.IBEditorWindowLastContentRect
</string>
<string>
4845.IBPluginDependency
</string>
<string>
4846.IBPluginDependency
</string>
<string>
4850.IBEditorWindowLastContentRect
</string>
...
...
@@ -12738,6 +12739,7 @@ LCAuLi4</string>
<bytes
key=
"NSTransformStruct"
>
AUQTwAAAAAAAA
</bytes>
</object>
<string>
com.apple.InterfaceBuilder.CocoaPlugin
</string>
<string>
{{329, 634}, {100, 100}}
</string>
<string>
com.apple.InterfaceBuilder.CocoaPlugin
</string>
<string>
com.apple.InterfaceBuilder.CocoaPlugin
</string>
<string>
{{564, 654}, {400, 22}}
</string>
...
...
modules/gui/macosx/MainWindow.m
View file @
6e56b492
...
...
@@ -177,6 +177,9 @@ static VLCMainWindow *_o_sharedInstance = nil;
[
o_detached_video_window
setDelegate
:
self
];
[
self
useOptimizedDrawing
:
YES
];
if
(
!
OSX_LEOPARD
)
[
o_right_split_view
setWantsLayer
:
YES
];
[
o_play_btn
setToolTip
:
_NS
(
"Play/Pause"
)];
[
o_detached_play_btn
setToolTip
:
[
o_play_btn
toolTip
]];
[
o_bwd_btn
setToolTip
:
_NS
(
"Backward"
)];
...
...
@@ -928,17 +931,23 @@ static VLCMainWindow *_o_sharedInstance = nil;
-
(
void
)
resizePlaylistAfterCollapse
{
id
o_playlist_viewitem
;
if
(
OSX_LEOPARD
)
o_playlist_viewitem
=
o_playlist_table
;
else
o_playlist_viewitem
=
[
o_playlist_table
animator
];
NSRect
plrect
;
plrect
=
[
[
o_playlist_table
animator
]
frame
];
plrect
=
[
o_playlist_table
frame
];
plrect
.
size
.
height
=
i_lastSplitViewHeight
-
19
.
0
;
// actual pl top bar height, which differs from its frame
[
[
o_playlist_table
animator
]
setFrame
:
plrect
];
[
o_playlist_viewitem
setFrame
:
plrect
];
NSRect
rightSplitRect
;
rightSplitRect
=
[
o_right_split_view
frame
];
plrect
=
[
[
o_dropzone_box
animator
]
frame
];
plrect
=
[
o_dropzone_box
frame
];
plrect
.
origin
.
x
=
(
rightSplitRect
.
size
.
width
-
plrect
.
size
.
width
)
/
2
;
plrect
.
origin
.
y
=
(
rightSplitRect
.
size
.
height
-
plrect
.
size
.
height
)
/
2
;
[
[
o_dropzone_box
animator
]
setFrame
:
plrect
];
[
o_playlist_viewitem
setFrame
:
plrect
];
}
-
(
void
)
makeSplitViewVisible
...
...
@@ -956,6 +965,9 @@ static VLCMainWindow *_o_sharedInstance = nil;
new_frame
.
origin
.
y
=
old_frame
.
origin
.
y
+
old_frame
.
size
.
height
-
newHeight
;
new_frame
.
size
.
height
=
newHeight
;
if
(
OSX_LEOPARD
)
[
self
setFrame
:
new_frame
display
:
YES
animate
:
YES
];
else
[[
self
animator
]
setFrame
:
new_frame
display
:
YES
animate
:
YES
];
}
...
...
@@ -1406,16 +1418,22 @@ static VLCMainWindow *_o_sharedInstance = nil;
-
(
void
)
showDropZone
{
b_dropzone_active
=
YES
;
[
o_right_split_view
addSubview
:
o_dropzone_view
];
[
o_right_split_view
addSubview
:
o_dropzone_view
positioned
:
NSWindowAbove
relativeTo
:
o_playlist_table
];
[
o_dropzone_view
setFrame
:
[
o_playlist_table
frame
]];
[[
o_playlist_table
animator
]
setHidden
:
YES
];
if
(
OSX_LEOPARD
)
[
o_playlist_table
setHidden
:
YES
];
else
[[
o_playlist_table
animator
]
setHidden
:
YES
];
}
-
(
void
)
hideDropZone
{
b_dropzone_active
=
NO
;
[
o_dropzone_view
removeFromSuperview
];
[[
o_playlist_table
animator
]
setHidden
:
NO
];
if
(
OSX_LEOPARD
)
[
o_playlist_table
setHidden
:
NO
];
else
[[
o_playlist_table
animator
]
setHidden
:
NO
];
}
-
(
void
)
hideSplitView
...
...
@@ -1942,7 +1960,10 @@ static VLCMainWindow *_o_sharedInstance = nil;
if
(
right_window_point
>
right_screen_point
)
new_frame
.
origin
.
x
-=
(
right_window_point
-
right_screen_point
);
[[
o_videoWindow
animator
]
setFrame
:
new_frame
display
:
YES
];
if
(
OSX_LEOPARD
)
[
o_videoWindow
setFrame
:
new_frame
display
:
YES
];
else
[[
o_videoWindow
animator
]
setFrame
:
new_frame
display
:
YES
];
}
-
(
void
)
setNativeVideoSize
:(
NSSize
)
size
...
...
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