[vlc-commits] macosx: Remove VLCHUDPopUpButtonCell class

Marvin Scholz git at videolan.org
Sun Feb 18 17:37:54 CET 2018


vlc | branch: master | Marvin Scholz <epirat07 at gmail.com> | Sun Feb 18 17:07:39 2018 +0100| [08de1e429a555b7e0e367b5c152074b59176e234] | committer: Marvin Scholz

macosx: Remove VLCHUDPopUpButtonCell class

This was used on macOS versions lower than 10.10 to draw custom
HUD-style controls and is not necessary anymore.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=08de1e429a555b7e0e367b5c152074b59176e234
---

 .../package/macosx/VLC.xcodeproj/project.pbxproj   |   6 -
 modules/gui/macosx/Makefile.am                     |   1 -
 modules/gui/macosx/VLCHUDPopUpButtonCell.h         |  53 ---
 modules/gui/macosx/VLCHUDPopUpButtonCell.m         | 413 ---------------------
 4 files changed, 473 deletions(-)

diff --git a/extras/package/macosx/VLC.xcodeproj/project.pbxproj b/extras/package/macosx/VLC.xcodeproj/project.pbxproj
index 5c832d6f98..53c66f3711 100644
--- a/extras/package/macosx/VLC.xcodeproj/project.pbxproj
+++ b/extras/package/macosx/VLC.xcodeproj/project.pbxproj
@@ -82,7 +82,6 @@
 		6B4D50931E7979CB004479B5 /* VLCSimplePrefsWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = 6B4D50921E7979CB004479B5 /* VLCSimplePrefsWindow.m */; };
 		6B4D50961E7A7D16004479B5 /* NSSound+VLCAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 6B4D50951E7A7D16004479B5 /* NSSound+VLCAdditions.m */; };
 		6B4D50A71E7AB52C004479B5 /* NSScreen+VLCAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 6B4D50A61E7AB52C004479B5 /* NSScreen+VLCAdditions.m */; };
-		6B5978C51EFBFBF2003D9C80 /* VLCHUDPopUpButtonCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 6B5978C41EFBFBF2003D9C80 /* VLCHUDPopUpButtonCell.m */; };
 		6B6FFF701EF9EC350001CEB1 /* CompatibilityFixes.m in Sources */ = {isa = PBXBuildFile; fileRef = 6B6FFF6F1EF9EC350001CEB1 /* CompatibilityFixes.m */; };
 		6B7F1FDF1F07DA920002BDD8 /* VLCHexNumberFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = 6B7F1FDE1F07DA920002BDD8 /* VLCHexNumberFormatter.m */; };
 		6B8166291EBFC34300C26F1B /* VLCDefaultValueSlider.m in Sources */ = {isa = PBXBuildFile; fileRef = 6B6A499B1DFD9B23009128AC /* VLCDefaultValueSlider.m */; };
@@ -157,8 +156,6 @@
 		6B4D50951E7A7D16004479B5 /* NSSound+VLCAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSSound+VLCAdditions.m"; sourceTree = "<group>"; };
 		6B4D50A51E7AB52C004479B5 /* NSScreen+VLCAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSScreen+VLCAdditions.h"; sourceTree = "<group>"; };
 		6B4D50A61E7AB52C004479B5 /* NSScreen+VLCAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSScreen+VLCAdditions.m"; sourceTree = "<group>"; };
-		6B5978C31EFBFBF2003D9C80 /* VLCHUDPopUpButtonCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VLCHUDPopUpButtonCell.h; sourceTree = "<group>"; };
-		6B5978C41EFBFBF2003D9C80 /* VLCHUDPopUpButtonCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VLCHUDPopUpButtonCell.m; sourceTree = "<group>"; };
 		6B6A499A1DFD9B23009128AC /* VLCDefaultValueSlider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VLCDefaultValueSlider.h; sourceTree = "<group>"; };
 		6B6A499B1DFD9B23009128AC /* VLCDefaultValueSlider.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VLCDefaultValueSlider.m; sourceTree = "<group>"; };
 		6B6A499C1DFD9B23009128AC /* VLCDefaultValueSliderCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VLCDefaultValueSliderCell.h; sourceTree = "<group>"; };
@@ -1471,8 +1468,6 @@
 		6B846FE81CF5D89500112E54 /* HUD UI Classes */ = {
 			isa = PBXGroup;
 			children = (
-				6B5978C31EFBFBF2003D9C80 /* VLCHUDPopUpButtonCell.h */,
-				6B5978C41EFBFBF2003D9C80 /* VLCHUDPopUpButtonCell.m */,
 				6B846FDC1CF5D88C00112E54 /* VLCHUDButtonCell.h */,
 				6B846FDD1CF5D88C00112E54 /* VLCHUDButtonCell.m */,
 				6B846FDE1CF5D88C00112E54 /* VLCHUDCheckboxCell.h */,
@@ -1804,7 +1799,6 @@
 				1C3113BC1E508C6900D4DD76 /* VLCKeyboardBacklightControl.m in Sources */,
 				1C3113BD1E508C6900D4DD76 /* macosx.m in Sources */,
 				1C3113BF1E508C6900D4DD76 /* VLCMainMenu.m in Sources */,
-				6B5978C51EFBFBF2003D9C80 /* VLCHUDPopUpButtonCell.m in Sources */,
 				1C3113C11E508C6900D4DD76 /* VLCMainWindow.m in Sources */,
 				6B0292E61F43256300A50082 /* VLCBottomBarView.m in Sources */,
 				1C3113C31E508C6900D4DD76 /* VLCMainWindowTitleView.m in Sources */,
diff --git a/modules/gui/macosx/Makefile.am b/modules/gui/macosx/Makefile.am
index 639806b2ca..e945320b3b 100644
--- a/modules/gui/macosx/Makefile.am
+++ b/modules/gui/macosx/Makefile.am
@@ -82,7 +82,6 @@ libmacosx_plugin_la_SOURCES = \
 	gui/macosx/VLCHUDTableView.h gui/macosx/VLCHUDTableView.m \
 	gui/macosx/VLCHUDTableCornerView.h gui/macosx/VLCHUDTableCornerView.m \
 	gui/macosx/VLCHUDStepperCell.h gui/macosx/VLCHUDStepperCell.m \
-	gui/macosx/VLCHUDPopUpButtonCell.h gui/macosx/VLCHUDPopUpButtonCell.m \
 	gui/macosx/VLCInputManager.h gui/macosx/VLCInputManager.m \
 	gui/macosx/VLCMainWindow.h gui/macosx/VLCMainWindow.m \
 	gui/macosx/VLCRendererDiscovery.h gui/macosx/VLCRendererDiscovery.m \
diff --git a/modules/gui/macosx/VLCHUDPopUpButtonCell.h b/modules/gui/macosx/VLCHUDPopUpButtonCell.h
deleted file mode 100644
index 23aeb31b12..0000000000
--- a/modules/gui/macosx/VLCHUDPopUpButtonCell.h
+++ /dev/null
@@ -1,53 +0,0 @@
-//
-//  VLCHUDPopUpButtonCell.h
-//  BGHUDAppKit
-//
-//  Created by BinaryGod on 5/31/08.
-//
-//  Copyright (c) 2008, Tim Davis (BinaryMethod.com, binary.god at gmail.com)
-//  All rights reserved.
-//
-//  Redistribution and use in source and binary forms, with or without modification,
-//  are permitted provided that the following conditions are met:
-//
-//		Redistributions of source code must retain the above copyright notice, this
-//	list of conditions and the following disclaimer.
-//
-//		Redistributions in binary form must reproduce the above copyright notice,
-//	this list of conditions and the following disclaimer in the documentation and/or
-//	other materials provided with the distribution.
-//
-//		Neither the name of the BinaryMethod.com nor the names of its contributors
-//	may be used to endorse or promote products derived from this software without
-//	specific prior written permission.
-//
-//	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS AS IS AND
-//	ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-//	WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-//	IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-//	INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-//	BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
-//	OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-//	WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-//	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-//	POSSIBILITY OF SUCH DAMAGE.
-
-#import <Cocoa/Cocoa.h>
-
- at interface VLCHUDPopUpButtonCell : NSPopUpButtonCell
-
- at property NSShadow *dropShadow;
-
- at property NSColor *strokeColor;
- at property NSColor *darkStrokeColor;
- at property NSColor *disabledStrokeColor;
- at property NSColor *selectionTextActiveColor;
- at property NSColor *selectionTextInActiveColor;
- at property NSColor *cellTextColor;
- at property NSColor *disabledCellTextColor;
-
- at property NSGradient *normalGradient;
- at property NSGradient *disabledNormalGradient;
-
-
- at end
diff --git a/modules/gui/macosx/VLCHUDPopUpButtonCell.m b/modules/gui/macosx/VLCHUDPopUpButtonCell.m
deleted file mode 100644
index b07fd3996c..0000000000
--- a/modules/gui/macosx/VLCHUDPopUpButtonCell.m
+++ /dev/null
@@ -1,413 +0,0 @@
-//
-//  VLCHUDPopUpButtonCell.m
-//  BGHUDAppKit
-//
-//  Created by BinaryGod on 5/31/08.
-//
-//  Copyright (c) 2008, Tim Davis (BinaryMethod.com, binary.god at gmail.com)
-//  All rights reserved.
-//
-//  Redistribution and use in source and binary forms, with or without modification,
-//  are permitted provided that the following conditions are met:
-//
-//		Redistributions of source code must retain the above copyright notice, this
-//	list of conditions and the following disclaimer.
-//
-//		Redistributions in binary form must reproduce the above copyright notice,
-//	this list of conditions and the following disclaimer in the documentation and/or
-//	other materials provided with the distribution.
-//
-//		Neither the name of the BinaryMethod.com nor the names of its contributors
-//	may be used to endorse or promote products derived from this software without
-//	specific prior written permission.
-//
-//	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS AS IS AND
-//	ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-//	WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-//	IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-//	INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-//	BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
-//	OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-//	WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-//	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-//	POSSIBILITY OF SUCH DAMAGE.
-
-#import "VLCHUDPopUpButtonCell.h"
-#import "CompatibilityFixes.h"
-
- at implementation VLCHUDPopUpButtonCell
-
-+ (void)load
-{
-    /* On 10.10+ we do not want custom drawing, therefore we swap out the implementation
-     * of the selectors below with their original implementations.
-     * Just calling super in the overridden methods is not enough, to get the same drawin
-     * a non-subclassed cell would use.
-     */
-    if (OSX_YOSEMITE_AND_HIGHER) {
-        swapoutOverride([VLCHUDPopUpButtonCell class], @selector(initWithCoder:));
-        swapoutOverride([VLCHUDPopUpButtonCell class], @selector(drawWithFrame:inView:));
-    }
-}
-
-- (instancetype)initWithCoder:(NSCoder *)coder
-{
-    self = [super initWithCoder:coder];
-    if (self) {
-        _dropShadow = [[NSShadow alloc] init];
-        [_dropShadow setShadowColor:[NSColor blackColor]];
-        [_dropShadow setShadowBlurRadius:2];
-        [_dropShadow setShadowOffset:NSMakeSize(0, -1)];
-
-        _strokeColor = [NSColor colorWithDeviceRed:0.749f green:0.761f blue:0.788f alpha:1.0f];
-        _darkStrokeColor = [NSColor colorWithDeviceRed:0.141f green:0.141f blue:0.141f alpha:0.5f];
-        _disabledStrokeColor = [NSColor colorWithDeviceRed:0.749f green:0.761f blue:0.788f alpha:0.2f];
-        _selectionTextActiveColor = [NSColor whiteColor];
-        _selectionTextInActiveColor = [NSColor whiteColor];
-        _cellTextColor = [NSColor whiteColor];
-        _disabledCellTextColor = [NSColor colorWithDeviceRed:1 green:1 blue:1 alpha:0.2f];
-
-        _normalGradient = [[NSGradient alloc] initWithStartingColor:[NSColor colorWithDeviceRed:0.251f green:0.251f blue:0.255f alpha:0.5f]
-                                                        endingColor:[NSColor colorWithDeviceRed:0.118f green:0.118f blue:0.118f alpha:0.5f]];
-        _disabledNormalGradient = [[NSGradient alloc] initWithStartingColor:[NSColor colorWithDeviceRed:0.251f green:0.251f blue:0.255f alpha:0.2f]
-                                                                endingColor:[NSColor colorWithDeviceRed:0.118f green:0.118f blue:0.118f alpha:0.2f]];
-    }
-    return self;
-}
-
-#pragma mark Drawing Functions
-
-- (void)drawWithFrame:(NSRect)cellFrame inView:(NSView *)controlView {
-
-    NSRect frame = cellFrame;
-
-    // Adjust frame by .5 so lines draw true
-    frame.origin.x += .5f;
-    frame.origin.y += .5f;
-    frame.size.height = [self cellSize].height;
-
-    // Make Adjustments to Frame based on Cell Size
-    switch ([self controlSize]) {
-
-        case NSRegularControlSize:
-            frame.origin.x += 3;
-            frame.size.width -= 7;
-            frame.origin.y += 2;
-            frame.size.height -= 7;
-            break;
-
-        case NSSmallControlSize:
-            frame.origin.y += 1;
-            frame.size.height -= 6;
-            frame.origin.x += 3;
-            frame.size.width -= 7;
-            break;
-
-        case NSMiniControlSize:
-            frame.origin.x += 1;
-            frame.size.width -= 4;
-            frame.size.height -= 2;
-            break;
-    }
-
-    if ([self isBordered]) {
-        NSBezierPath *path = [NSBezierPath bezierPathWithRoundedRect:frame xRadius: 4 yRadius: 4];
-
-        [NSGraphicsContext saveGraphicsState];
-        [_dropShadow set];
-        [_darkStrokeColor set];
-        [path stroke];
-        [NSGraphicsContext restoreGraphicsState];
-
-        if ([self isEnabled]) {
-            [_normalGradient drawInBezierPath: path angle: 90];
-            [_strokeColor set];
-        } else {
-            [_disabledNormalGradient drawInBezierPath: path angle: 90];
-            [_disabledStrokeColor set];
-        }
-
-        [path setLineWidth: 1.0f ];
-        [path stroke];
-    }
-
-    // Draw the arrows
-    [self drawArrowsInRect: frame];
-
-    // Adjust rect for title drawing
-    switch ([self controlSize]) {
-
-        case NSRegularControlSize:
-
-            frame.origin.x += 8;
-            frame.origin.y += 1;
-            frame.size.width -= 29;
-            break;
-
-        case NSSmallControlSize:
-
-            frame.origin.x += 8;
-            frame.origin.y += 2;
-            frame.size.width -= 29;
-            break;
-
-        case NSMiniControlSize:
-
-            frame.origin.x += 8;
-            frame.origin.y += .5f;
-            frame.size.width -= 26;
-            break;
-    }
-
-    NSMutableAttributedString *aTitle = [[self attributedTitle] mutableCopy];
-
-    // Make sure aTitle actually contains something
-    if (aTitle.length > 0) {
-        [aTitle beginEditing];
-        [aTitle removeAttribute:NSForegroundColorAttributeName range:NSMakeRange(0, aTitle.length)];
-
-        if (self.isEnabled) {
-            if (self.isHighlighted) {
-
-                if (self.controlView.window.isKeyWindow) {
-                    [aTitle addAttribute:NSForegroundColorAttributeName
-                                   value:_selectionTextActiveColor
-                                   range:NSMakeRange(0, aTitle.length)];
-                } else {
-                    [aTitle addAttribute:NSForegroundColorAttributeName
-                                   value:_selectionTextInActiveColor
-                                   range:NSMakeRange(0, aTitle.length)];
-                }
-            } else {
-                [aTitle addAttribute:NSForegroundColorAttributeName
-                               value:_cellTextColor
-                               range:NSMakeRange(0, aTitle.length)];
-            }
-        } else {
-            [aTitle addAttribute:NSForegroundColorAttributeName
-                           value:_disabledCellTextColor
-                           range:NSMakeRange(0, aTitle.length)];
-        }
-        [aTitle endEditing];
-    }
-
-    int arrowAdjustment = 0;
-
-    cellFrame.size.height -= 2;
-    if (self.isBordered) {
-        cellFrame.origin.x += 5;
-    }
-
-    switch (self.controlSize) {
-        case NSRegularControlSize:
-            arrowAdjustment = 21;
-            break;
-
-        case NSSmallControlSize:
-            arrowAdjustment = 18;
-            break;
-
-        case NSMiniControlSize:
-            arrowAdjustment = 15;
-            break;
-    }
-
-    NSRect titleFrame = NSMakeRect(cellFrame.origin.x + 5, NSMidY(cellFrame) - ([aTitle size].height/2), cellFrame.size.width - arrowAdjustment, [aTitle size].height);
-    NSRect imageFrame = NSMakeRect(cellFrame.origin.x, cellFrame.origin.y, cellFrame.size.width - arrowAdjustment, cellFrame.size.height);
-
-    if([self image]) {
-
-        switch ([self imagePosition]) {
-
-            case NSImageLeft:
-            case NSNoImage:
-
-                titleFrame.origin.x += 6;
-                titleFrame.origin.x += [[self image] size].width;
-                break;
-
-            case NSImageOnly:
-                titleFrame.size.width = 0;
-                break;
-
-            default:
-                break;
-        }
-    }
-
-    if([self imagePosition] != NSImageOnly) {
-        [super drawTitle:aTitle withFrame:titleFrame inView:controlView];
-    }
-
-
-    if([self imagePosition] != NSNoImage) {
-        [self drawImage:[self image] withFrame:imageFrame inView:controlView];
-    }
-}
-
-- (void)drawArrowsInRect:(NSRect) frame {
-
-    CGFloat arrowsWidth;
-    CGFloat arrowsHeight;
-    CGFloat arrowWidth;
-    CGFloat arrowHeight;
-
-    int arrowAdjustment = 0;
-
-    //Adjust based on Control size
-    switch ([self controlSize]) {
-        default: // Silence uninitialized variable warnings
-        case NSRegularControlSize:
-
-            if ([self isBordered]) {
-
-                arrowAdjustment = 21;
-            } else {
-
-                arrowAdjustment = 11;
-            }
-
-            arrowWidth = 3.5f;
-            arrowHeight = 2.5f;
-            arrowsHeight = 2;
-            arrowsWidth = 2.5f;
-            break;
-
-        case NSSmallControlSize:
-
-            if ([self isBordered]) {
-
-                arrowAdjustment = 18;
-            } else {
-
-                arrowAdjustment = 8;
-            }
-
-            arrowWidth = 3.5f;
-            arrowHeight = 2.5f;
-            arrowsHeight = 2;
-            arrowsWidth = 2.5f;
-
-            break;
-
-        case NSMiniControlSize:
-
-            if ([self isBordered]) {
-
-                arrowAdjustment = 15;
-            } else {
-
-                arrowAdjustment = 5;
-            }
-
-            arrowWidth = 2.5f;
-            arrowHeight = 1.5f;
-            arrowsHeight = 1.5f;
-            arrowsWidth = 2;
-            break;
-    }
-
-    frame.origin.x += (frame.size.width - arrowAdjustment);
-    frame.size.width = arrowAdjustment;
-
-    if ([self pullsDown]) {
-
-        NSBezierPath *arrow = [[NSBezierPath alloc] init];
-
-        NSPoint points[3];
-
-        points[0] = NSMakePoint(frame.origin.x + ((frame.size.width /2) - arrowWidth), frame.origin.y + ((frame.size.height /2) - arrowHeight));
-        points[1] = NSMakePoint(frame.origin.x + ((frame.size.width /2) + arrowWidth), frame.origin.y + ((frame.size.height /2) - arrowHeight));
-        points[2] = NSMakePoint(frame.origin.x + (frame.size.width /2), frame.origin.y + ((frame.size.height /2) + arrowHeight));
-
-        [arrow appendBezierPathWithPoints: points count: 3];
-        
-        if ([self isEnabled]) {
-            
-            if ([self isHighlighted]) {
-                
-                if ([[[self controlView] window] isKeyWindow]) {
-                    
-                    [_selectionTextActiveColor set];
-                } else {
-                    
-                    [_selectionTextInActiveColor set];
-                }
-            } else {
-                
-                [_cellTextColor set];
-            }
-        } else {
-            
-            [_disabledCellTextColor set];
-        }
-        
-        [arrow fill];
-    } else {
-        
-        NSBezierPath *topArrow = [[NSBezierPath alloc] init];
-        
-        NSPoint topPoints[3];
-        
-        topPoints[0] = NSMakePoint(frame.origin.x + ((frame.size.width /2) - arrowsWidth), frame.origin.y + ((frame.size.height /2) - arrowsHeight));
-        topPoints[1] = NSMakePoint(frame.origin.x + ((frame.size.width /2) + arrowsWidth), frame.origin.y + ((frame.size.height /2) - arrowsHeight));
-        topPoints[2] = NSMakePoint(frame.origin.x + (frame.size.width /2), frame.origin.y + ((frame.size.height /2) - ((arrowsHeight * 2) + 2)));
-        
-        [topArrow appendBezierPathWithPoints: topPoints count: 3];
-        
-        if([self isEnabled]) {
-            
-            if([self isHighlighted]) {
-                
-                if([[[self controlView] window] isKeyWindow])
-                {
-                    
-                    [_selectionTextActiveColor set];
-                } else {
-                    
-                    [_selectionTextInActiveColor set];
-                }
-            } else {
-                
-                [_cellTextColor set];
-            }
-        } else {
-            
-            [_disabledCellTextColor set];
-        }
-        [topArrow fill];
-        
-        NSBezierPath *bottomArrow = [[NSBezierPath alloc] init];
-        
-        NSPoint bottomPoints[3];
-        
-        bottomPoints[0] = NSMakePoint(frame.origin.x + ((frame.size.width /2) - arrowsWidth), frame.origin.y + ((frame.size.height /2) + arrowsHeight));
-        bottomPoints[1] = NSMakePoint(frame.origin.x + ((frame.size.width /2) + arrowsWidth), frame.origin.y + ((frame.size.height /2) + arrowsHeight));
-        bottomPoints[2] = NSMakePoint(frame.origin.x + (frame.size.width /2), frame.origin.y + ((frame.size.height /2) + ((arrowsHeight * 2) + 2)));
-        
-        [bottomArrow appendBezierPathWithPoints: bottomPoints count: 3];
-        
-        if ([self isEnabled]) {
-            
-            if ([self isHighlighted]) {
-                
-                if ([[[self controlView] window] isKeyWindow]) {
-                    
-                    [_selectionTextActiveColor set];
-                } else {
-                    
-                    [_selectionTextInActiveColor set];
-                }
-            } else {
-                
-                [_cellTextColor set];
-            }
-        } else {
-            
-            [_disabledCellTextColor set];
-        }
-        [bottomArrow fill];
-    }
-}
-
- at end



More information about the vlc-commits mailing list