mirror of
https://github.com/gnustep/libs-gui.git
synced 2025-06-01 16:31:55 +00:00
Resizing error fixes.
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@3928 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
288f80c15c
commit
7173823879
3 changed files with 31 additions and 24 deletions
|
@ -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>
|
1999-03-14 Adam Fedor <fedor@gnu.org>
|
||||||
|
|
||||||
* Model/GNUmakefile: Add ifeq's for OpenStep 4.0 compilation
|
* Model/GNUmakefile: Add ifeq's for OpenStep 4.0 compilation
|
||||||
|
|
|
@ -56,15 +56,15 @@
|
||||||
NSString *_columnTitle;
|
NSString *_columnTitle;
|
||||||
}
|
}
|
||||||
|
|
||||||
- (void)setIsLoaded:(BOOL)flag;
|
- (void)setIsLoaded: (BOOL)flag;
|
||||||
- (BOOL)isLoaded;
|
- (BOOL)isLoaded;
|
||||||
- (void)setColumnScrollView:(id)aView;
|
- (void)setColumnScrollView: (id)aView;
|
||||||
- columnScrollView;
|
- columnScrollView;
|
||||||
- (void)setColumnMatrix:(id)aMatrix;
|
- (void)setColumnMatrix: (id)aMatrix;
|
||||||
- columnMatrix;
|
- columnMatrix;
|
||||||
- (void)setNumberOfRows:(int)num;
|
- (void)setNumberOfRows: (int)num;
|
||||||
- (int)numberOfRows;
|
- (int)numberOfRows;
|
||||||
- (void)setColumnTitle:(NSString *)aString;
|
- (void)setColumnTitle: (NSString *)aString;
|
||||||
- (NSString *)columnTitle;
|
- (NSString *)columnTitle;
|
||||||
- emptyView;
|
- emptyView;
|
||||||
|
|
||||||
|
@ -155,7 +155,7 @@
|
||||||
//
|
//
|
||||||
@interface NSBrowser (Private)
|
@interface NSBrowser (Private)
|
||||||
- (void)_adjustMatrixOfColumn: (int)column;
|
- (void)_adjustMatrixOfColumn: (int)column;
|
||||||
- (void)_adjustScrollerFrameOfColumn: (int)column force:(BOOL)flag;
|
- (void)_adjustScrollerFrameOfColumn: (int)column force: (BOOL)flag;
|
||||||
- (void)_adjustScrollerFrames: (BOOL)flag;
|
- (void)_adjustScrollerFrames: (BOOL)flag;
|
||||||
- (void)_performLoadOfColumn: (int)column;
|
- (void)_performLoadOfColumn: (int)column;
|
||||||
- (void)_unloadFromColumn: (int)column;
|
- (void)_unloadFromColumn: (int)column;
|
||||||
|
@ -270,10 +270,10 @@
|
||||||
BOOL both = NO;
|
BOOL both = NO;
|
||||||
|
|
||||||
if (![anObject respondsToSelector:
|
if (![anObject respondsToSelector:
|
||||||
@selector(browser: willDisplayCell:atRow:column:)])
|
@selector(browser: willDisplayCell: atRow: column:)])
|
||||||
[NSException raise: NSBrowserIllegalDelegateException
|
[NSException raise: NSBrowserIllegalDelegateException
|
||||||
format: @"Delegate does not respond to %s\n",
|
format: @"Delegate does not respond to %s\n",
|
||||||
"browser: willDisplayCell:atRow:column:"];
|
"browser: willDisplayCell: atRow: column: "];
|
||||||
|
|
||||||
if ([anObject respondsToSelector:
|
if ([anObject respondsToSelector:
|
||||||
@selector(browser: numberOfRowsInColumn:)])
|
@selector(browser: numberOfRowsInColumn:)])
|
||||||
|
@ -283,7 +283,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
if ([anObject respondsToSelector:
|
if ([anObject respondsToSelector:
|
||||||
@selector(browser: createRowsForColumn:inMatrix:)])
|
@selector(browser:createRowsForColumn:inMatrix:)])
|
||||||
{
|
{
|
||||||
_passiveDelegate = NO;
|
_passiveDelegate = NO;
|
||||||
|
|
||||||
|
@ -298,14 +298,14 @@
|
||||||
if (!flag)
|
if (!flag)
|
||||||
[NSException raise: NSBrowserIllegalDelegateException
|
[NSException raise: NSBrowserIllegalDelegateException
|
||||||
format: @"Delegate does not respond to %s or %s\n",
|
format: @"Delegate does not respond to %s or %s\n",
|
||||||
"browser: numberOfRowsInColumn:",
|
"browser: numberOfRowsInColumn: ",
|
||||||
"browser: createRowsForColumn:inMatrix:"];
|
"browser: createRowsForColumn: inMatrix: "];
|
||||||
|
|
||||||
if (both)
|
if (both)
|
||||||
[NSException raise: NSBrowserIllegalDelegateException
|
[NSException raise: NSBrowserIllegalDelegateException
|
||||||
format: @"Delegate responds to both %s and %s\n",
|
format: @"Delegate responds to both %s and %s\n",
|
||||||
"browser: numberOfRowsInColumn:",
|
"browser: numberOfRowsInColumn: ",
|
||||||
"browser: createRowsForColumn:inMatrix:"];
|
"browser: createRowsForColumn: inMatrix: "];
|
||||||
|
|
||||||
[anObject retain];
|
[anObject retain];
|
||||||
[_browserDelegate release];
|
[_browserDelegate release];
|
||||||
|
@ -586,7 +586,7 @@
|
||||||
|
|
||||||
// Ask the delegate for the column title
|
// Ask the delegate for the column title
|
||||||
if ([_browserDelegate respondsToSelector:
|
if ([_browserDelegate respondsToSelector:
|
||||||
@selector(browser: titleOfColumn:)])
|
@selector(browser:titleOfColumn:)])
|
||||||
[self setTitle: [_browserDelegate browser: self
|
[self setTitle: [_browserDelegate browser: self
|
||||||
titleOfColumn: column]
|
titleOfColumn: column]
|
||||||
ofColumn: column];
|
ofColumn: column];
|
||||||
|
@ -761,7 +761,7 @@
|
||||||
|
|
||||||
// xxx Should we trigger an exception?
|
// xxx Should we trigger an exception?
|
||||||
if (![_browserDelegate respondsToSelector:
|
if (![_browserDelegate respondsToSelector:
|
||||||
@selector(browser: isColumnValid:)])
|
@selector(browser:isColumnValid:)])
|
||||||
return;
|
return;
|
||||||
|
|
||||||
// Loop through the visible columns
|
// Loop through the visible columns
|
||||||
|
@ -1014,7 +1014,7 @@
|
||||||
|
|
||||||
// Ask delegate if selection is ok
|
// Ask delegate if selection is ok
|
||||||
if ([_browserDelegate respondsToSelector:
|
if ([_browserDelegate respondsToSelector:
|
||||||
@selector(browser: selectRow:inColumn:)])
|
@selector(browser:selectRow:inColumn:)])
|
||||||
{
|
{
|
||||||
int row = [sender selectedRow];
|
int row = [sender selectedRow];
|
||||||
shouldSelect = [_browserDelegate browser: self selectRow: row
|
shouldSelect = [_browserDelegate browser: self selectRow: row
|
||||||
|
@ -1024,7 +1024,7 @@
|
||||||
{
|
{
|
||||||
// Try the other method
|
// Try the other method
|
||||||
if ([_browserDelegate respondsToSelector:
|
if ([_browserDelegate respondsToSelector:
|
||||||
@selector(browser: selectCellWithString:inColumn:)])
|
@selector(browser:selectCellWithString:inColumn:)])
|
||||||
{
|
{
|
||||||
id c = [sender selectedCell];
|
id c = [sender selectedCell];
|
||||||
shouldSelect = [_browserDelegate browser: self
|
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
|
// Only if we've loaded the first column
|
||||||
if ((_isLoaded) || (flag))
|
if ((_isLoaded) || (flag))
|
||||||
|
@ -1554,12 +1554,11 @@ NSRect mr;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
- (void)setFrame: (NSRect)frameRect
|
- (void) resizeSubviewsWithOldSize: (NSSize)oldSize
|
||||||
{
|
{
|
||||||
NSLog (@"NSBrowser setFrame ");
|
[super resizeSubviewsWithOldSize: oldSize];
|
||||||
[super setFrame: frameRect];
|
[self tile];
|
||||||
[self tile]; // recalc browser's elements
|
[self _adjustScrollerFrames: YES];
|
||||||
[self _adjustScrollerFrames: YES]; // adjust browser's matrix
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@end
|
@end
|
||||||
|
|
|
@ -854,7 +854,7 @@ static SEL invalidateSel = @selector(_invalidateCoordinates);
|
||||||
{
|
{
|
||||||
id e, o;
|
id e, o;
|
||||||
|
|
||||||
if (![self autoresizesSubviews] && !is_rotated_from_base)
|
if ([self autoresizesSubviews] == NO || is_rotated_from_base == YES)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
e = [sub_views objectEnumerator];
|
e = [sub_views objectEnumerator];
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue