Changeset 319

Show
Ignore:
Timestamp:
11/27/07 11:30:23 (1 year ago)
Author:
gbooker
Message:

Use a smaller image for frontrow as well (not yet tested).

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/SapphireFrontRowCompat.h

    r277 r319  
    1515+ (BOOL)usingFrontRow; 
    1616+ (id)imageAtPath:(NSString *)path; 
     17+ (id)image:(id)image scaledToSize:(NSSize)size; 
    1718+ (BRAdornedMenuItemLayer *)textMenuItemForScene:(BRRenderScene *)scene folder:(BOOL)folder; 
    1819+ (void)setTitle:(NSString *)title forMenu:(BRAdornedMenuItemLayer *)menu; 

  • trunk/SapphireFrontRowCompat.m

    r277 r319  
    1212@interface SapphireFrontRowCompat (compat) 
    1313+ (id)imageWithPath:(NSString *)path; 
    14 @end 
     14+ (id)imageWithCGImageRef:(CGImageRef)ref; 
     15- (CGImageRef)image; 
     16@end 
     17 
     18NSData *CreateBitmapDataFromImage(CGImageRef image, unsigned int width, unsigned int height); 
    1519 
    1620/*Yes, wrong class and other wrong things, just to shut up warnings*/ 
    …… 
    5862} 
    5963 
     64+ (id)image:(id)image scaledToSize:(NSSize)size 
     65{ 
     66        CGImageRef cgImage = [(SapphireFrontRowCompat *)image image]; 
     67        CGImageRef result = CGImageCreate(size.width, size.height, CGImageGetBitsPerComponent(cgImage), CGImageGetBitsPerPixel(cgImage), CGImageGetBytesPerRow(cgImage), CGImageGetColorSpace(cgImage), CGImageGetBitmapInfo(cgImage), CGImageGetDataProvider(cgImage), NULL, YES, kCGRenderingIntentDefault); 
     68         
     69        id ret = [NSClassFromString(@"BRImage") imageWithCGImageRef:result]; 
     70        CGImageRelease(result); 
     71        return ret; 
     72} 
     73 
    6074+ (BRAdornedMenuItemLayer *)textMenuItemForScene:(BRRenderScene *)scene folder:(BOOL)folder 
    6175{ 

  • trunk/SapphirePosterChooser.h

    r285 r319  
    77// 
    88 
    9 #import "SapphireCenteredMenuController.h" 
     9#import "SapphireMenuController.h" 
    1010 
    1111#define POSTER_CHOOSE_CANCEL            -1 
    …… 
    1515@class BRRenderScene, BRRenderLayer, BRMarchingIconLayer; 
    1616 
    17 @interface SapphirePosterChooser : SapphireCenteredMenuController { 
     17@interface SapphirePosterChooser : SapphireMenuController { 
    1818        NSArray                 *posters; 
    1919        NSMutableArray  *posterLayers; 

  • trunk/SapphirePosterChooser.m

    r285 r319  
    269269{ 
    270270    if ( index >= [posterLayers count] ) 
    271         return ( nil ); 
     271        return defaultImage; 
    272272         
    273273    return [posterLayers objectAtIndex:index]; 
    …… 
    342342                id ret = [SapphireFrontRowCompat imageAtPath:thePosterPath]; 
    343343                if(ret != nil) 
    344                         return ret; 
     344                        return [SapphireFrontRowCompat image:ret scaledToSize:NSMakeSize(510, 755)]; 
    345345                else 
    346346                        return defaultImage; 
    …… 
    407407                frame.origin.y=-200.0f; 
    408408        } 
     409        else 
     410                frame.size.height = ([fileInfoText frame].origin.y - frame.origin.y) * 1.2f; 
    409411    [posterMarch setFrame: frame]; 
    410412        [SapphireFrontRowCompat addSublayer:posterMarch toControl:self];