Commit d17ad9e3 authored by Felix Paul Kühne's avatar Felix Paul Kühne Committed by Jean-Baptiste Kempf

macosx: fix another rendering issue with the 'time slider's fancy gradient effect'

(cherry picked from commit ebab71b5)
Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent 3f94b00d
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
<integer value="4895"/> <integer value="4895"/>
<integer value="1617"/> <integer value="1617"/>
<integer value="4596"/> <integer value="4596"/>
<integer value="4756"/> <integer value="2"/>
<integer value="2730"/> <integer value="2730"/>
<integer value="4722"/> <integer value="4722"/>
<integer value="915"/> <integer value="915"/>
...@@ -608,7 +608,7 @@ ...@@ -608,7 +608,7 @@
</object> </object>
<object class="NSCustomView" id="515305233"> <object class="NSCustomView" id="515305233">
<reference key="NSNextResponder" ref="429932428"/> <reference key="NSNextResponder" ref="429932428"/>
<int key="NSvFlags">-2147483374</int> <int key="NSvFlags">-2147479278</int>
<string key="NSFrame">{{401, 110}, {163, 96}}</string> <string key="NSFrame">{{401, 110}, {163, 96}}</string>
<reference key="NSSuperview" ref="429932428"/> <reference key="NSSuperview" ref="429932428"/>
<object class="CIAdditionCompositing" key="NSViewCompositeFilter"> <object class="CIAdditionCompositing" key="NSViewCompositeFilter">
......
...@@ -411,16 +411,16 @@ static VLCMainWindow *_o_sharedInstance = nil; ...@@ -411,16 +411,16 @@ static VLCMainWindow *_o_sharedInstance = nil;
[o_video_view setFrame: winrect]; [o_video_view setFrame: winrect];
previousSavedFrame = winrect; previousSavedFrame = winrect;
if (OSX_LION)
[o_resize_view setImage: NULL];
if ([self styleMask] & NSResizableWindowMask)
[o_resize_view removeFromSuperviewWithoutNeedingDisplay];
[self display]; [self display];
} }
else else
[o_video_view setFrame: [o_split_view frame]]; [o_video_view setFrame: [o_split_view frame]];
if (OSX_LION)
[o_resize_view setImage: NULL];
if ([self styleMask] & NSResizableWindowMask)
[o_resize_view removeFromSuperviewWithoutNeedingDisplay];
} }
#pragma mark - #pragma mark -
...@@ -521,13 +521,11 @@ static VLCMainWindow *_o_sharedInstance = nil; ...@@ -521,13 +521,11 @@ static VLCMainWindow *_o_sharedInstance = nil;
if ([o_video_view isHidden] && [o_playlist_btn isEnabled]) { if ([o_video_view isHidden] && [o_playlist_btn isEnabled]) {
[o_split_view setHidden: YES]; [o_split_view setHidden: YES];
[o_video_view setHidden: NO]; [o_video_view setHidden: NO];
NSLog( @"showing pl" );
} }
else else
{ {
[o_video_view setHidden: YES]; [o_video_view setHidden: YES];
[o_split_view setHidden: NO]; [o_split_view setHidden: NO];
NSLog( @"show vout" );
} }
} }
else else
...@@ -1021,7 +1019,7 @@ static VLCMainWindow *_o_sharedInstance = nil; ...@@ -1021,7 +1019,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
- (void)drawFancyGradientEffectForTimeSlider - (void)drawFancyGradientEffectForTimeSlider
{ {
NSAutoreleasePool * o_pool = [[NSAutoreleasePool alloc] init]; NSAutoreleasePool * o_pool = [[NSAutoreleasePool alloc] init];
float f_value = ([o_time_sld frame].size.width - [o_time_sld frame].origin.x - [o_time_sld knobPosition]) * -1.0; CGFloat f_value = [o_time_sld knobPosition];
if (f_value > 7.5) if (f_value > 7.5)
{ {
NSRect oldFrame = [o_time_sld_fancygradient_view frame]; NSRect oldFrame = [o_time_sld_fancygradient_view frame];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment