Commit 7e96734b authored by David Fuhrmann's avatar David Fuhrmann

macosx: add mouse scroll support for fullscreen time slider

parent a8bd7a32
...@@ -76,12 +76,15 @@ ...@@ -76,12 +76,15 @@
- (void)setVoutWasUpdated: (VLCWindow *)o_window; - (void)setVoutWasUpdated: (VLCWindow *)o_window;
@end @end
@class VLCProgressView;
@interface VLCFSPanelView : NSView @interface VLCFSPanelView : NSView
{ {
NSColor *fillColor; NSColor *fillColor;
NSButton *o_prev, *o_next, *o_bwd, *o_fwd, *o_play, *o_fullscreen; NSButton *o_prev, *o_next, *o_bwd, *o_fwd, *o_play, *o_fullscreen;
NSTextField *o_streamTitle_txt, *o_streamPosition_txt; NSTextField *o_streamTitle_txt, *o_streamPosition_txt;
NSSlider *o_fs_timeSlider, *o_fs_volumeSlider; NSSlider *o_fs_timeSlider, *o_fs_volumeSlider;
VLCProgressView *o_progress_view;
NSImage *o_background_img, *o_vol_sld_img, *o_vol_mute_img, *o_vol_max_img, *o_time_sld_img; NSImage *o_background_img, *o_vol_sld_img, *o_vol_mute_img, *o_vol_max_img, *o_time_sld_img;
NSTimeInterval last_fwd_event; NSTimeInterval last_fwd_event;
NSTimeInterval last_bwd_event; NSTimeInterval last_bwd_event;
......
...@@ -417,11 +417,14 @@ ...@@ -417,11 +417,14 @@
[o_bwd setContinuous:YES]; [o_bwd setContinuous:YES];
/* time slider */ /* time slider */
s_rc = [self frame]; // (surrounding progress view for swipe behaviour)
s_rc.origin.x = 15; s_rc.origin.x = 15;
s_rc.origin.y = 45; s_rc.origin.y = 45;
s_rc.size.width = 518; s_rc.size.width = 518;
s_rc.size.height = 13; s_rc.size.height = 13;
o_progress_view = [[VLCProgressView alloc] initWithFrame: s_rc];
s_rc.origin.x = 0;
s_rc.origin.y = 0;
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];
...@@ -431,7 +434,8 @@ ...@@ -431,7 +434,8 @@
[o_fs_timeSlider setAction: @selector(fsTimeSliderUpdate:)]; [o_fs_timeSlider setAction: @selector(fsTimeSliderUpdate:)];
[[o_fs_volumeSlider cell] accessibilitySetOverrideValue:_NS("Position") forAttribute:NSAccessibilityTitleAttribute]; [[o_fs_volumeSlider cell] accessibilitySetOverrideValue:_NS("Position") forAttribute:NSAccessibilityTitleAttribute];
[[o_fs_timeSlider cell] accessibilitySetOverrideValue:_NS("Click and move the mouse while keeping the button pressed to use this slider to change current playback position.") forAttribute:NSAccessibilityDescriptionAttribute]; [[o_fs_timeSlider cell] accessibilitySetOverrideValue:_NS("Click and move the mouse while keeping the button pressed to use this slider to change current playback position.") forAttribute:NSAccessibilityDescriptionAttribute];
[self addSubview: o_fs_timeSlider]; [self addSubview: o_progress_view];
[o_progress_view addSubview: o_fs_timeSlider];
/* volume slider */ /* volume slider */
s_rc = [self frame]; s_rc = [self 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