From 71738238792a207b72447a7a7443b565d1341973 Mon Sep 17 00:00:00 2001
From: richard <richard@72102866-910b-0410-8b05-ffd578937521>
Date: Tue, 16 Mar 1999 10:53:42 +0000
Subject: [PATCH] Resizing error fixes.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@3928 72102866-910b-0410-8b05-ffd578937521
---
 ChangeLog          |  8 ++++++++
 Source/NSBrowser.m | 45 ++++++++++++++++++++++-----------------------
 Source/NSView.m    |  2 +-
 3 files changed, 31 insertions(+), 24 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2413fb913..1e967ca15 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Mon Mar 15 10:15:00 1999  Richard Frith-Macdonald <richard@brainstorm.co.uk>
+
+	* Source/NSView.m: ([-resizeWithOldSuperviewSize:]) Added fix so this
+	method is active at correct times - there was a logic error in the
+	original code.
+	* Source/NSBrowser.m: Removed ([-setFrame:]) and added an implementation
+	of ([-resizeSubviewsWithOldSize:]) such that autoresizing now works.
+
 1999-03-14  Adam Fedor  <fedor@gnu.org>
 
 	* Model/GNUmakefile: Add ifeq's for OpenStep 4.0 compilation
diff --git a/Source/NSBrowser.m b/Source/NSBrowser.m
index e45162761..472d8096f 100644
--- a/Source/NSBrowser.m
+++ b/Source/NSBrowser.m
@@ -56,15 +56,15 @@
   NSString *_columnTitle;
 }
 
-- (void)setIsLoaded:(BOOL)flag;
+- (void)setIsLoaded: (BOOL)flag;
 - (BOOL)isLoaded;
-- (void)setColumnScrollView:(id)aView;
+- (void)setColumnScrollView: (id)aView;
 - columnScrollView;
-- (void)setColumnMatrix:(id)aMatrix;
+- (void)setColumnMatrix: (id)aMatrix;
 - columnMatrix;
-- (void)setNumberOfRows:(int)num;
+- (void)setNumberOfRows: (int)num;
 - (int)numberOfRows;
-- (void)setColumnTitle:(NSString *)aString;
+- (void)setColumnTitle: (NSString *)aString;
 - (NSString *)columnTitle;
 - emptyView;
 
@@ -155,7 +155,7 @@
 //
 @interface NSBrowser (Private)
 - (void)_adjustMatrixOfColumn: (int)column;
-- (void)_adjustScrollerFrameOfColumn: (int)column force:(BOOL)flag;
+- (void)_adjustScrollerFrameOfColumn: (int)column force: (BOOL)flag;
 - (void)_adjustScrollerFrames: (BOOL)flag;
 - (void)_performLoadOfColumn: (int)column;
 - (void)_unloadFromColumn: (int)column;
@@ -270,10 +270,10 @@
   BOOL both = NO;
 
   if (![anObject respondsToSelector:
-		  @selector(browser: willDisplayCell:atRow:column:)])
+		  @selector(browser: willDisplayCell: atRow: column:)])
     [NSException raise: NSBrowserIllegalDelegateException
 		 format: @"Delegate does not respond to %s\n",
-		 "browser: willDisplayCell:atRow:column:"];
+		 "browser: willDisplayCell: atRow: column: "];
 
   if ([anObject respondsToSelector:
 		  @selector(browser: numberOfRowsInColumn:)])
@@ -283,7 +283,7 @@
     }
 
   if ([anObject respondsToSelector:
-		  @selector(browser: createRowsForColumn:inMatrix:)])
+		  @selector(browser:createRowsForColumn:inMatrix:)])
     {
       _passiveDelegate = NO;
 
@@ -298,14 +298,14 @@
   if (!flag)
     [NSException raise: NSBrowserIllegalDelegateException
 		 format: @"Delegate does not respond to %s or %s\n",
-		 "browser: numberOfRowsInColumn:",
-		 "browser: createRowsForColumn:inMatrix:"];
+		 "browser: numberOfRowsInColumn: ",
+		 "browser: createRowsForColumn: inMatrix: "];
 
   if (both)
     [NSException raise: NSBrowserIllegalDelegateException
 		 format: @"Delegate responds to both %s and %s\n",
-		 "browser: numberOfRowsInColumn:",
-		 "browser: createRowsForColumn:inMatrix:"];
+		 "browser: numberOfRowsInColumn: ",
+		 "browser: createRowsForColumn: inMatrix: "];
 
   [anObject retain];
   [_browserDelegate release];
@@ -586,7 +586,7 @@
 
   // Ask the delegate for the column title
   if ([_browserDelegate respondsToSelector:
-			  @selector(browser: titleOfColumn:)])
+			  @selector(browser:titleOfColumn:)])
     [self setTitle: [_browserDelegate browser: self
 				      titleOfColumn: column]
 	  ofColumn: column];
@@ -761,7 +761,7 @@
 
   // xxx Should we trigger an exception?
   if (![_browserDelegate respondsToSelector:
-			   @selector(browser: isColumnValid:)])
+			   @selector(browser:isColumnValid:)])
     return;
 
   // Loop through the visible columns
@@ -1014,7 +1014,7 @@
 
   // Ask delegate if selection is ok
   if ([_browserDelegate respondsToSelector:
-				@selector(browser: selectRow:inColumn:)])
+				@selector(browser:selectRow:inColumn:)])
     {
       int row = [sender selectedRow];
       shouldSelect = [_browserDelegate browser: self selectRow: row
@@ -1024,7 +1024,7 @@
     {
       // Try the other method
       if ([_browserDelegate respondsToSelector:
-			    @selector(browser: selectCellWithString:inColumn:)])
+			    @selector(browser:selectCellWithString:inColumn:)])
 	{
 	  id c = [sender selectedCell];
 	  shouldSelect = [_browserDelegate browser: self
@@ -1392,7 +1392,7 @@ NSRect mr;
 		}
 }
 
-- (void)_adjustScrollerFrameOfColumn: (int)column force:(BOOL)flag
+- (void)_adjustScrollerFrameOfColumn: (int)column force: (BOOL)flag
 {
   // Only if we've loaded the first column
   if ((_isLoaded) || (flag))
@@ -1554,12 +1554,11 @@ NSRect mr;
     }
 }
 
-- (void)setFrame: (NSRect)frameRect
+- (void) resizeSubviewsWithOldSize: (NSSize)oldSize
 {
-NSLog (@"NSBrowser setFrame ");
-  	[super setFrame: frameRect];
-	[self tile];								// recalc browser's elements
-	[self _adjustScrollerFrames: YES];			// adjust browser's matrix
+  [super resizeSubviewsWithOldSize: oldSize];
+  [self tile];
+  [self _adjustScrollerFrames: YES];
 }
 
 @end
diff --git a/Source/NSView.m b/Source/NSView.m
index 6ace3dc7f..53c03a2e9 100644
--- a/Source/NSView.m
+++ b/Source/NSView.m
@@ -854,7 +854,7 @@ static SEL	invalidateSel = @selector(_invalidateCoordinates);
 {
   id e, o;
 
-  if (![self autoresizesSubviews] && !is_rotated_from_base)
+  if ([self autoresizesSubviews] == NO || is_rotated_from_base == YES)
     return;
 
   e = [sub_views objectEnumerator];