[vlc-commits] macosx: disable virtually all CoreAnimation effects in the main window on Leopard (close #7047)
Felix Paul Kühne
git at videolan.org
Thu Aug 9 18:10:11 CEST 2012
vlc/vlc-2.0 | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Thu Aug 9 17:10:47 2012 +0200| [b9aa608bbb53c892ba83ee999ac4be61b68d84cd] | committer: Felix Paul Kühne
macosx: disable virtually all CoreAnimation effects in the main window on Leopard (close #7047)
(cherry picked from commit 6e56b492f796a458e06dc21d29d534849af12fd8)
Conflicts:
extras/package/macosx/Resources/English.lproj/MainMenu.xib
> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=b9aa608bbb53c892ba83ee999ac4be61b68d84cd
---
.../macosx/Resources/English.lproj/MainMenu.xib | 25 ++++++-------
modules/gui/macosx/MainWindow.m | 37 +++++++++++++++-----
2 files changed, 42 insertions(+), 20 deletions(-)
diff --git a/extras/package/macosx/Resources/English.lproj/MainMenu.xib b/extras/package/macosx/Resources/English.lproj/MainMenu.xib
index 747e4fa..ebe74e2 100644
--- a/extras/package/macosx/Resources/English.lproj/MainMenu.xib
+++ b/extras/package/macosx/Resources/English.lproj/MainMenu.xib
@@ -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">11E53</string>
+ <string key="IBDocument.SystemVersion">11G15</string>
<string key="IBDocument.InterfaceBuilderVersion">851</string>
<string key="IBDocument.AppKitVersion">1138.47</string>
<string key="IBDocument.HIToolboxVersion">569.00</string>
@@ -21,16 +21,16 @@
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
- <integer value="2770"/>
- <integer value="915"/>
- <integer value="2730"/>
+ <integer value="21"/>
+ <integer value="4845"/>
+ <integer value="4722"/>
+ <integer value="1617"/>
<integer value="4850"/>
- <integer value="4756"/>
- <integer value="24"/>
+ <integer value="915"/>
+ <integer value="29"/>
+ <integer value="2770"/>
<integer value="4948"/>
- <integer value="1617"/>
- <integer value="4596"/>
- <integer value="4722"/>
+ <integer value="2730"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -594,7 +594,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>
@@ -4382,7 +4381,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>
@@ -4390,9 +4388,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">
@@ -11593,6 +11592,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>
@@ -12495,6 +12495,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>{{363, 734}, {400, 22}}</string>
diff --git a/modules/gui/macosx/MainWindow.m b/modules/gui/macosx/MainWindow.m
index 1994bd1..59da5fd 100644
--- a/modules/gui/macosx/MainWindow.m
+++ b/modules/gui/macosx/MainWindow.m
@@ -170,6 +170,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")];
@@ -716,17 +719,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
@@ -744,6 +753,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];
}
@@ -1197,16 +1209,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
@@ -1691,7 +1709,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
More information about the vlc-commits
mailing list