Useless #includes

[vlc] / modules / gui / macosx / fspanel.m

diff --git a/modules/gui/macosx/fspanel.m b/modules/gui/macosx/fspanel.m
index a325133f5c0715e486bc5a50265d0749bf000f2a..d941fc33ee97545eb57ad684a2518d464ad95638 100644 (file)
--- a/modules/gui/macosx/fspanel.m
+++ b/modules/gui/macosx/fspanel.m
@@ -417,11 +417,14 @@
     [o_bwd setContinuous:YES];
 
     /* time slider */
-    s_rc = [self frame];
+    // (surrounding progress view for swipe behaviour)
     s_rc.origin.x = 15;
-    s_rc.origin.y = 55;
+    s_rc.origin.y = 45;
     s_rc.size.width = 518;
-    s_rc.size.height = 9;
+    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 setMinValue:0];
     [o_fs_timeSlider setMaxValue:10000];
@@ -431,7 +434,8 @@
     [o_fs_timeSlider setAction: @selector(fsTimeSliderUpdate:)];
     [[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];
-    [self addSubview: o_fs_timeSlider];
+    [self addSubview: o_progress_view];
+    [o_progress_view addSubview: o_fs_timeSlider];
 
     /* volume slider */
     s_rc = [self frame];
@@ -603,7 +607,7 @@
     addImage(o_vol_sld_img, 26, 23, NSCompositeSourceOver);
     addImage(o_vol_mute_img, 16, 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
@@ -634,7 +638,7 @@
     [[NSGraphicsContext currentContext] restoreGraphicsState];
 
     NSRect knobRect = [[self cell] knobRectFlipped:NO];
-    knobRect.origin.y+=7.5;
+    knobRect.origin.y+=4;
     [[[NSColor blackColor] colorWithAlphaComponent:0.6] set];
     [self drawKnobInRect: knobRect];
 }