Diff for /chimera/BookmarksToolbar.mm between versions 1.3 and 1.11

version 1.3, 2002/04/17 07:38:31 version 1.11, 2002/04/19 02:15:03
Line 9 Line 9
 #import "BookmarksButton.h"  #import "BookmarksButton.h"
 #import "BookmarksToolbar.h"  #import "BookmarksToolbar.h"
 #import "BookmarksService.h"  #import "BookmarksService.h"
   #include "nsIDOMElement.h"
   
 @implementation BookmarksToolbar  @implementation BookmarksToolbar
   
Line 16 Line 17
   self = [super initWithFrame:frame];    self = [super initWithFrame:frame];
   if (self) {    if (self) {
     mBookmarks = nsnull;      mBookmarks = nsnull;
       mButtons = [[NSMutableArray alloc] init];
   }    }
   
   // Create a sample button.  
 /*  BookmarksButton* testButton = [[[BookmarksButton alloc] initWithFrame: NSMakeRect(2, 1, 100, 17)] autorelease];  
   [testButton setTitle: @"Gamespot - Gaming Site"];  
   [self addSubview: testButton];   
   */  
     
   return self;    return self;
 }  }
   
Line 32 Line 27
   // Initialization code here.    // Initialization code here.
   mBookmarks = new BookmarksService(self);    mBookmarks = new BookmarksService(self);
   mBookmarks->AddObserver();    mBookmarks->AddObserver();
  mBookmarks->ConstructBookmarksToolbar();  mBookmarks->EnsureToolbarRoot();
   [self buildButtonList];
 }  }
   
 -(void) dealloc  -(void) dealloc
 {  {
     [mButtons autorelease];
   mBookmarks->RemoveObserver();    mBookmarks->RemoveObserver();
   delete mBookmarks;    delete mBookmarks;
   [super dealloc];    [super dealloc];
Line 44 Line 41
   
 - (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 53 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));
   }
 
   // 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;
     }
   }    }
   
  // The buttons will paint themselves.  [self setNeedsDisplay: YES];
 }
 
 -(void)reflowButtons
 {
   [self reflowButtonsStartingAtIndex: 0];
 }
 
 -(void)reflowButtonsStartingAtIndex: (int)aIndex
 {
   float oldHeight = [self frame].size.height;
   float computedHeight = 18;
   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.
       currY += 18;
       computedHeight += 18;
       if (computedHeight > oldHeight) {
         [self setFrame: NSMakeRect([self frame].origin.x, [self frame].origin.y+(oldHeight-computedHeight),
                                    [self frame].size.width, computedHeight)];
         [self setNeedsDisplay: YES];
 
         BookmarksButton* prevButton = [mButtons objectAtIndex: (i-1)];
         float y = [prevButton frame].origin.y;
       }
       
       prevX = 2;
       [button setFrame: NSMakeRect(prevX, currY, width, height)];
       prevX += [button frame].size.width + 2;
     }
     
     [button setNeedsDisplay: YES];
   }
 
   float currentHeight = [self frame].size.height;
   if (computedHeight != currentHeight) {
     [self setFrame: NSMakeRect([self frame].origin.x, [self frame].origin.y + (currentHeight - computedHeight),
                                [self frame].size.width, computedHeight)];
     [self setNeedsDisplay: YES];
   }
   
   float sizeChange = computedHeight - oldHeight;
   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];
 
   if (oldFrame.size.width == aRect.size.width)
     return;
 
   int count = [mButtons count];
   if (count <= 2)
     return; // We have too few buttons to care.
   
   // Do some optimizations when we have only one row.
   if (aRect.size.height < 25) // We have only one row.
   {
     if (oldFrame.size.width < aRect.size.width)
       // We got bigger.  If we already only have one row, just bail.
       //        This will optimize for a common resizing case.
       return;
     else {
       // We got smaller.  Just go to the last button and see if it is outside
       // our bounds.
       BookmarksButton* button = [mButtons objectAtIndex:(count-1)];
       if ([button frame].origin.x + [button frame].size.width >
           [self bounds].size.width - 2) {
         // The button doesn't fit any more.  Reflow starting at this index.
         [self reflowButtonsStartingAtIndex:(count-1)];
       }
     }
   }
   else {
     // See if we got bigger or smaller.  We could gain or lose a row.
     [self reflowButtons];
   }
 }  }
   
 @end  @end

Removed from v.1.3  
changed lines
  Added in v.1.11


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