X-Git-Url: http://git.ithinksw.org/ITKit.git/blobdiff_plain/a95939f73c92bc42ae05d4585b57c6b95126601a..5e2815af6cd3f5dffaca2e8d1876c0a355209859:/Showcase/Controller.m

diff --git a/Showcase/Controller.m b/Showcase/Controller.m
index 8455cb2..49e9e35 100755
--- a/Showcase/Controller.m
+++ b/Showcase/Controller.m
@@ -1,5 +1,6 @@
 #import "Controller.h"
-#import "ITTransientStatusWindow.h"
+//#import "ITTransientStatusWindow.h"
+#import "ITIconAndTextStatusWindow.h"
 #import "ITTSWBackgroundView.h"
 #import "ITTextField.h"
 #import "ITBevelView.h"
@@ -36,7 +37,7 @@
     [testTextField setCastsShadow:YES];
     [tabView setAllowsDragging:YES];
     [bevelView setBevelDepth:10];
-    statusWindow = [ITTransientStatusWindow sharedWindow];
+    statusWindow = [ITIconAndTextStatusWindow sharedWindow];
     [statusWindow setEntryEffect:[[ITCutWindowEffect alloc] initWithWindow:statusWindow]];
     [statusWindow setExitEffect:[[ITDissolveWindowEffect alloc] initWithWindow:statusWindow]];
     [[statusWindow entryEffect] setEffectTime:[swEntrySpeedSlider floatValue]];
@@ -148,80 +149,10 @@
 
 - (IBAction)buildStatusWindow:(id)sender
 {
-    NSImageView *imageView    = nil;
-    ITTextField *textField    = nil;
     NSImage     *image        = [NSImage imageNamed:SW_IMAGE];
-    NSRect       imageRect;
-    NSRect       textRect;   
-
-    float imageWidth    = 0.0;
-    float imageHeight   = 0.0;
-    float textWidth     = 0.0;
-    float textHeight    = 0.0;
-    float contentHeight = 0.0;
-    float windowWidth   = 0.0;
-    float windowHeight  = 0.0;
-
-    NSString     *text     = [swSampleTextView string];
-    NSArray      *lines    = [text componentsSeparatedByString:@"\n"];
-    id			  oneLine  = nil;
-    NSEnumerator *lineEnum = [lines objectEnumerator];
-
-    NSFont *font           = [NSFont fontWithName:@"Lucida Grande Bold" size:18];
-    NSDictionary *attr     = [NSDictionary dictionaryWithObject:font forKey:NSFontAttributeName];
-    
-    // Get image width and height.
-    imageWidth  = [image size].width;
-    imageHeight = [image size].height;
-    
-    // Iterate over each line to get text width and height
-    while ( oneLine = [lineEnum nextObject] ) {
-        // Get the width of one line, adding 8.0 because Apple sucks donkey rectum.
-        float oneLineWidth = ( [oneLine sizeWithAttributes:attr].width + 8.0 );
-        // Add the height of this line to the total text height
-        textHeight += [oneLine sizeWithAttributes:attr].height;
-        // If this line wider than the last one, set it as the text width.
-        textWidth = ( ( textWidth > oneLineWidth ) ? textWidth : oneLineWidth );
-    }
-    
-    // Add 4.0 to the final textHeight to accomodate the shadow.
-    textHeight += 4.0;
-    NSLog(@"%f", textHeight);
-    // Set the content height to the greater of the text and image heights.
-    contentHeight = ( ( imageHeight > textHeight ) ? imageHeight : textHeight );
-    
-    // Setup the Window, and remove all its contentview's subviews.
-    windowWidth  = ( SW_PAD + imageWidth + SW_SPACE + textWidth + SW_PAD );
-    windowHeight = ( SW_PAD + contentHeight + SW_PAD );
-    [statusWindow setFrame:NSMakeRect(SW_BORDER, SW_BORDER, windowWidth, windowHeight) display:YES animate:YES];
-    [[[statusWindow contentView] subviews] makeObjectsPerformSelector:@selector(removeFromSuperview)];
-    
-    // Setup, position, fill, and add the image view to the content view.
-    imageRect = NSMakeRect( SW_PAD,
-                            (SW_PAD + ((contentHeight - imageHeight) / 2)),
-                            imageWidth,
-                            imageHeight );
-    imageView = [[[NSImageView alloc] initWithFrame:imageRect] autorelease];
-    [imageView setImage:image];
-    [[statusWindow contentView] addSubview:imageView];
-    
-    // Setup, position, fill, and add the text view to the content view.
-    textRect = NSMakeRect( (SW_PAD + imageWidth + SW_SPACE),
-                           (SW_PAD + ((contentHeight - textHeight) / 2)),
-                           textWidth,
-                           textHeight);
-    textField = [[[ITTextField alloc] initWithFrame:textRect] autorelease];
-    [textField setEditable:NO];
-    [textField setSelectable:NO];
-    [textField setBordered:NO];
-    [textField setDrawsBackground:NO];
-    [textField setFont:[NSFont fontWithName:@"Lucida Grande Bold" size:18]];
-    [textField setTextColor:[NSColor whiteColor]];
-    [textField setCastsShadow:YES];
-    [textField setStringValue:text];
-    [[statusWindow contentView] addSubview:textField];
-
-    [[statusWindow contentView] setNeedsDisplay:YES];
+    NSString    *text     = [swSampleTextView string];
+    [statusWindow setImage:image];
+    [statusWindow buildTextWindowWithString:text];
 }
 
 - (IBAction)toggleStatusWindow:(id)sender