[vlc-commits] macosx: improve drawing of the 'fancy gradient effect for time slider' ( fixes #5568)
Felix Paul Kühne
git at videolan.org
Tue Dec 20 00:04:32 CET 2011
vlc | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Tue Dec 20 00:04:26 2011 +0100| [68660d8a820d62c7f1b4661d41565bebb637f155] | committer: Felix Paul Kühne
macosx: improve drawing of the 'fancy gradient effect for time slider' (fixes #5568)
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=68660d8a820d62c7f1b4661d41565bebb637f155
---
.../macosx/Resources/English.lproj/MainMenu.xib | 15 ++++++++-------
modules/gui/macosx/MainWindow.m | 2 +-
2 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/extras/package/macosx/Resources/English.lproj/MainMenu.xib b/extras/package/macosx/Resources/English.lproj/MainMenu.xib
index 315f262..e2aed54 100644
--- a/extras/package/macosx/Resources/English.lproj/MainMenu.xib
+++ b/extras/package/macosx/Resources/English.lproj/MainMenu.xib
@@ -21,14 +21,14 @@
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
- <integer value="915"/>
- <integer value="283"/>
<integer value="4722"/>
+ <integer value="283"/>
+ <integer value="2730"/>
+ <integer value="915"/>
<integer value="1617"/>
- <integer value="4681"/>
<integer value="235"/>
- <integer value="2730"/>
<integer value="4596"/>
+ <integer value="21"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -676,6 +676,7 @@
<string key="NSFrame">{{222, 12}, {61, 11}}</string>
<reference key="NSSuperview" ref="429932428"/>
<int key="NSViewLayerContentsRedrawPolicy">2</int>
+ <bool key="NSViewCanDrawConcurrently">YES</bool>
<string key="NSClassName">VLCProgressBarGradientEffect</string>
</object>
<object class="NSSplitView" id="302568132">
@@ -10904,7 +10905,7 @@ LCAuLi4</string>
<boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/>
- <string>{{428, 299}, {222, 363}}</string>
+ <string>{{473, 299}, {222, 363}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -11071,7 +11072,7 @@ LCAuLi4</string>
<boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/>
- <string>{{284, 662}, {468, 20}}</string>
+ <string>{{329, 662}, {468, 20}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -11088,7 +11089,7 @@ LCAuLi4</string>
<boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSAffineTransform">
- <bytes key="NSTransformStruct">P4AAAL+AAABDZgAAweAAAA</bytes>
+ <bytes key="NSTransformStruct">P4AAAL+AAABDlYAAwdAAAA</bytes>
</object>
<boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
diff --git a/modules/gui/macosx/MainWindow.m b/modules/gui/macosx/MainWindow.m
index 506cea4..b336d62 100644
--- a/modules/gui/macosx/MainWindow.m
+++ b/modules/gui/macosx/MainWindow.m
@@ -827,7 +827,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
- (void)drawFancyGradientEffectForTimeSlider
{
NSAutoreleasePool * o_pool = [[NSAutoreleasePool alloc] init];
- float f_value = ([o_time_sld_middle_view frame].size.width -5) * ([o_time_sld intValue] / [o_time_sld maxValue]);
+ float f_value = [o_time_sld_middle_view frame].size.width * ([o_time_sld intValue] / [o_time_sld maxValue]);
if (f_value > 5.0)
{
if (f_value != [o_time_sld_fancygradient_view frame].size.width)
More information about the vlc-commits
mailing list