Commit d4526f98 authored by Felix Paul Kühne's avatar Felix Paul Kühne

macosx: adapt fspanel layout to update time slider graphics

(cherry picked from commit 59d6ab773e2fcb7b112cee692ce34996491ce4b2)

Conflicts:
	NEWS
	modules/gui/macosx/fspanel.m
parent a80779ad
...@@ -3,6 +3,8 @@ Changes between 2.0.5 and 2.0.6: ...@@ -3,6 +3,8 @@ Changes between 2.0.5 and 2.0.6:
Mac OS X: Mac OS X:
* Fix subtitle rendering resolution when using OS X's native fullscreen mode * Fix subtitle rendering resolution when using OS X's native fullscreen mode
* Improve fullscreen controller time slider with larger click target
Changes between 2.0.4 and 2.0.5: Changes between 2.0.4 and 2.0.5:
-------------------------------- --------------------------------
......
...@@ -435,9 +435,9 @@ ...@@ -435,9 +435,9 @@
/* time slider */ /* time slider */
s_rc = [self frame]; s_rc = [self frame];
s_rc.origin.x = 15; s_rc.origin.x = 15;
s_rc.origin.y = 55; s_rc.origin.y = 45;
s_rc.size.width = 518; s_rc.size.width = 518;
s_rc.size.height = 9; s_rc.size.height = 13;
o_fs_timeSlider = [[VLCFSTimeSlider alloc] initWithFrame: s_rc]; o_fs_timeSlider = [[VLCFSTimeSlider alloc] initWithFrame: s_rc];
[o_fs_timeSlider setMinValue:0]; [o_fs_timeSlider setMinValue:0];
[o_fs_timeSlider setMaxValue:10000]; [o_fs_timeSlider setMaxValue:10000];
...@@ -618,7 +618,7 @@ ...@@ -618,7 +618,7 @@
addImage( o_vol_sld_img, 26, 23, NSCompositeSourceOver ); addImage( o_vol_sld_img, 26, 23, NSCompositeSourceOver );
addImage( o_vol_mute_img, 16, 18, NSCompositeSourceOver ); addImage( o_vol_mute_img, 16, 18, NSCompositeSourceOver );
addImage( o_vol_max_img, 124, 18, NSCompositeSourceOver ); addImage( o_vol_max_img, 124, 18, NSCompositeSourceOver );
addImage( o_time_sld_img, 15, 53, NSCompositeSourceOver ); addImage( o_time_sld_img, 15, 45, NSCompositeSourceOver );
} }
@end @end
...@@ -649,7 +649,7 @@ ...@@ -649,7 +649,7 @@
[[NSGraphicsContext currentContext] restoreGraphicsState]; [[NSGraphicsContext currentContext] restoreGraphicsState];
NSRect knobRect = [[self cell] knobRectFlipped:NO]; NSRect knobRect = [[self cell] knobRectFlipped:NO];
knobRect.origin.y+=7.5; knobRect.origin.y+=4;
[[[NSColor blackColor] colorWithAlphaComponent:0.6] set]; [[[NSColor blackColor] colorWithAlphaComponent:0.6] set];
[self drawKnobInRect: knobRect]; [self drawKnobInRect: knobRect];
} }
......
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