Diff for /chimera/BookmarksToolbar.mm between versions 1.1 and 1.10

version 1.1, 2002/04/16 02:03:15 version 1.10, 2002/04/19 01:08:30
Line 6 Line 6
 //  Copyright (c) 2001 __MyCompanyName__. All rights reserved.  //  Copyright (c) 2001 __MyCompanyName__. All rights reserved.
 //  //
   
   #import "BookmarksButton.h"
 #import "BookmarksToolbar.h"  #import "BookmarksToolbar.h"
#import "BookmarksService.h"
 #include "nsIDOMElement.h"
   
 @implementation BookmarksToolbar  @implementation BookmarksToolbar
   
 - (id)initWithFrame:(NSRect)frame {  - (id)initWithFrame:(NSRect)frame {
   self = [super initWithFrame:frame];    self = [super initWithFrame:frame];
   if (self) {    if (self) {
    // Initialization code here.    mBookmarks = nsnull;
     mButtons = [[NSMutableArray alloc] init];
   }    }
   return self;    return self;
 }  }
   
   -(void)initializeToolbar
   {
     // Initialization code here.
     mBookmarks = new BookmarksService(self);
     mBookmarks->AddObserver();
     mBookmarks->EnsureToolbarRoot();
     [self buildButtonList];
   }
   
   -(void) dealloc
   {
     [mButtons autorelease];
     mBookmarks->RemoveObserver();
     delete mBookmarks;
     [super dealloc];
   }
   
 - (void)drawRect:(NSRect)aRect {  - (void)drawRect:(NSRect)aRect {
   // Fill the background with our background color.    // Fill the background with our background color.
  [[NSColor colorWithCalibratedWhite: 0.98 alpha: 1.0] set];  //[[NSColor colorWithCalibratedWhite: 0.98 alpha: 1.0] set];
  NSRectFill(aRect);  //NSRectFill(aRect);
   
   //printf("The rect is: %f %f %f %f\n", aRect.origin.x, aRect.origin.y, aRect.size.width, aRect.size.height);    //printf("The rect is: %f %f %f %f\n", aRect.origin.x, aRect.origin.y, aRect.size.width, aRect.size.height);
       
Line 30 Line 50
       [self bounds].size.height) {        [self bounds].size.height) {
     // The personal toolbar is 21 pixels tall.  The bottom two pixels      // The personal toolbar is 21 pixels tall.  The bottom two pixels
     // are a separator.      // are a separator.
    [[NSColor colorWithCalibratedWhite: 0.92 alpha: 1.0] set];    [[NSColor colorWithCalibratedWhite: 0.90 alpha: 1.0] set];
    NSRectFill(NSMakeRect(aRect.origin.x, aRect.origin.y, aRect.size.width, 2));    NSRectFill(NSMakeRect(aRect.origin.x, [self bounds].size.height-2, aRect.size.width, [self bounds].size.height));
   }    }
   
  // Paint only those cells that overlap.  // The buttons will paint themselves. Just call our base class method.
   [super drawRect: aRect];
 }
 
 -(void)buildButtonList
 {
   // Build the buttons, and then lay them all out.
   nsCOMPtr<nsIDOMNode> child;
   BookmarksService::gToolbarRoot->GetFirstChild(getter_AddRefs(child));
   while (child) {
     nsCOMPtr<nsIDOMElement> childElt(do_QueryInterface(child));
     if (childElt) {
       BookmarksButton* button = [[[BookmarksButton alloc] initWithFrame: NSMakeRect(2, 1, 100, 17)] autorelease];
       [button setElement: childElt];
       [self addSubview: button];
       [mButtons addObject: button];
     }
 
     nsCOMPtr<nsIDOMNode> temp = child;
     temp->GetNextSibling(getter_AddRefs(child));
   }
 
   [self reflowButtons];
 }
 
 -(void)addButton: (nsIDOMElement*)aElt atIndex: (int)aIndex
 {
   BookmarksButton* button = [[[BookmarksButton alloc] initWithFrame: NSMakeRect(2, 1, 100, 17)] autorelease];
   [button setElement: aElt];
   [self addSubview: button];
   [mButtons insertObject: button atIndex: aIndex];
   [self reflowButtonsStartingAtIndex: aIndex];
 }
 
 -(void)removeButton: (nsIDOMElement*)aElt
 {
   int count = [mButtons count];
   for (int i = 0; i < count; i++) {
     BookmarksButton* button = [mButtons objectAtIndex: i];
     if ([button element] == aElt) {
       [mButtons removeObjectAtIndex: i];
       [button removeFromSuperview];
       if (count > i)
         [self reflowButtonsStartingAtIndex: i];
       break;
     }
   }
 
   [self setNeedsDisplay: YES];
 }
 
 -(void)reflowButtons
 {
   [self reflowButtonsStartingAtIndex: 0];
 }
 
 -(void)reflowButtonsStartingAtIndex: (int)aIndex
 {
   float sizeChange = 0;
   int count = [mButtons count];
   float currY = 1.0;
   float prevX = 2.0;
   if (aIndex > 0) {
     BookmarksButton* prevButton = [mButtons objectAtIndex: (aIndex-1)];
     prevX += [prevButton frame].origin.x + [prevButton frame].size.width;
     currY = [prevButton frame].origin.y;
   }
   for (int i = aIndex; i < count; i++) {
     BookmarksButton* button = [mButtons objectAtIndex: i];
     [button sizeToFit];
     float width = [button frame].size.width;
     float height = [button frame].size.height;
     if (width > 150)
       width = 150;
     if (height < 16)
       height = 16; // Our folder tiff is only 15 pixels for some reason.
     [button setFrame: NSMakeRect(prevX, currY, width, height)];
 
     prevX += [button frame].size.width + 2;
 
     if ([self bounds].size.width < prevX) {
       // The previous button didn't fit.  We need to make a new row.
       sizeChange += 18;
       currY += 18;
       [self setFrame: NSMakeRect([self frame].origin.x, [self frame].origin.y - 18.0,
                                  [self frame].size.width, [self frame].size.height + 18.0)];
       [self setNeedsDisplay: YES];
       prevX = 2;
       [button setFrame: NSMakeRect(prevX, currY, width, height)];
     }
     
     [button setNeedsDisplay: YES];
   }
 
   if (sizeChange != 0) {
     // We need to adjust the content area.
     NSView* view = [[[self window] windowController] getTabBrowser];
     [view setFrame: NSMakeRect([view frame].origin.x, [view frame].origin.y,
                                [view frame].size.width, [view frame].size.height - sizeChange)];
   }
 }
 
 -(BOOL)isFlipped
 {
   return YES; // Use flipped coords, so we can layout out from top row to bottom row.
 }
 
 -(void)setFrame:(NSRect)aRect
 {
   NSRect oldFrame = [self frame];
   [super setFrame:aRect];
 
   // See if we got bigger or smaller.  We could gain or lose a row.
       
 }  }
   

Removed from v.1.1  
changed lines
  Added in v.1.10


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>