macosx: fix visual appearance of fullscreen tic (refs #8628)

diff --git a/modules/gui/macosx/fspanel.m b/modules/gui/macosx/fspanel.m
index de79fa8f3e7472b2171785b916e500ce9277dd18..e506cecef8f52d26c6b0adf2132176b83f4a97de 100644 (file)
--- a/modules/gui/macosx/fspanel.m
+++ b/modules/gui/macosx/fspanel.m
@@ -739,5 +739,12 @@
     [self drawKnobInRect: knobRect];
 }
 
+- (void)drawFullVolBezierPath:(NSBezierPath*)bezierPath
+{
+    CGFloat fullVolPos = [self fullVolumePos];
+    [bezierPath moveToPoint:NSMakePoint(fullVolPos, [self frame].size.height)];
+    [bezierPath lineToPoint:NSMakePoint(fullVolPos, 1.)];
+}
+
 @end
 

diff --git a/modules/gui/macosx/misc.h b/modules/gui/macosx/misc.h
index 366d0e9e28b89639e1e0bf75b97ee2ce6b5f4901..a5e13740fbec688e8d01ce58403e0168b5716bbb 100644 (file)
--- a/modules/gui/macosx/misc.h
+++ b/modules/gui/macosx/misc.h
@@ -129,6 +129,8 @@
 - (void)scrollWheel:(NSEvent *)o_event;
 - (void)drawFullVolumeMarker;
 
+- (CGFloat)fullVolumePos;
+
 @end
 
 /*****************************************************************************

diff --git a/modules/gui/macosx/misc.m b/modules/gui/macosx/misc.m
index 7e7e54fe0d77e574ed10c9cf3de0431892cd6ff0..24ce840114a551ad44b3cb8081166e80bf75738b 100644 (file)
--- a/modules/gui/macosx/misc.m
+++ b/modules/gui/macosx/misc.m
@@ -551,8 +551,6 @@ void _drawFrameInRect(NSRect frameRect)
     if (maxAudioVol < 1.)
         return;
 
-    NSRect frame = [self frame];
-
     NSColor *drawingColor;
     // for bright artwork, a black color is used and vice versa
     if (_usesBrightArtwork)
@@ -561,21 +559,28 @@ void _drawFrameInRect(NSRect frameRect)
         drawingColor = [[NSColor whiteColor] colorWithAlphaComponent:.4];
 
     NSBezierPath* bezierPath = [NSBezierPath bezierPath];
-
-    CGFloat sliderRange = frame.size.width - [self knobThickness];
-    CGFloat sliderOrigin = [self knobThickness] / 2.;
-
-    CGFloat fullVolPos = 1. / maxAudioVol * sliderRange + sliderOrigin;
-
-    [bezierPath moveToPoint:NSMakePoint(fullVolPos, frame.size.height - 3.)];
-    [bezierPath lineToPoint:NSMakePoint(fullVolPos, 2.)];
+    [self drawFullVolBezierPath:bezierPath];
     [bezierPath closePath];
 
     bezierPath.lineWidth = 1.;
     [drawingColor setStroke];
     [bezierPath stroke];
-    [drawingColor setFill];
-    [bezierPath fill];
+}
+
+- (CGFloat)fullVolumePos
+{
+    CGFloat maxAudioVol = self.maxValue / AOUT_VOLUME_DEFAULT;
+    CGFloat sliderRange = [self frame].size.width - [self knobThickness];
+    CGFloat sliderOrigin = [self knobThickness] / 2.;
+
+    return 1. / maxAudioVol * sliderRange + sliderOrigin;
+}
+
+- (void)drawFullVolBezierPath:(NSBezierPath*)bezierPath
+{
+    CGFloat fullVolPos = [self fullVolumePos];
+    [bezierPath moveToPoint:NSMakePoint(fullVolPos, [self frame].size.height - 3.)];
+    [bezierPath lineToPoint:NSMakePoint(fullVolPos, 2.)];
 }
 
 @end
@@ -641,7 +646,7 @@ void _drawFrameInRect(NSRect frameRect)
                                  @"NO", @"DisplayTimeAsTimeRemaining",
                                  @"YES", @"DisplayFullscreenTimeAsTimeRemaining",
                                  nil];
-    
+
     [defaults registerDefaults:appDefaults];
 }
 
@@ -651,7 +656,7 @@ void _drawFrameInRect(NSRect frameRect)
         textAlignment = NSCenterTextAlignment;
         o_remaining_identifier = @"";
     }
-    
+
     return self;
 }