mirror of
https://github.com/gnustep/libs-gui.git
synced 2025-05-31 02:10:48 +00:00
* move DPSOperators.h to XDPS.
* move GPS headers into a new backend. * define GSContext.h/GSContext.m as abstract super for all drawing destinations (eliminates the need for DPS, GPS, DGS at the root of the AppKit) add appropriate defintion to various classes. * NSMatrix.m add abstract backend code from xraw (eliminate backend). * NSSlider.m add abstract backend code from xraw (eliminate backend). * NSSliderCell.m add abstract backend code from xraw (eliminate backend). * NSSplitView.m add abstract backend code from xraw (eliminate backend). replace private divider highlight method with NSHighlightRect() * NSWindow.m add class method to create backend specific window view. * NSTextField.m add abstract backend code from xraw (eliminate backend). * NSForm.m add abstract backend code from xraw (eliminate backend). * NSFormCell.m add abstract backend code from xraw (eliminate backend). * NSColorWell.m add abstract backend code from xraw (eliminate backend). * NSButton.m add abstract backend code from xraw (eliminate backend). * NSControl.m add abstract backend code from xraw (eliminate backend). * NSBox.m add abstract backend code from xraw (eliminate backend). * NSBrowser.m add abstract backend code from xraw (eliminate backend). * NSBrowserCell.m add abstract backend code from xraw (eliminate backend). git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@3321 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
fb25d335f4
commit
4dd58372f6
53 changed files with 2429 additions and 5144 deletions
|
@ -7,6 +7,8 @@
|
|||
|
||||
Author: Scott Christley <scottc@net-community.com>
|
||||
Date: 1996
|
||||
Author: Felipe A. Rodriguez <far@ix.netcom.com>
|
||||
Date: August 1998
|
||||
|
||||
This file is part of the GNUstep GUI Library.
|
||||
|
||||
|
@ -993,7 +995,9 @@
|
|||
[_horizontalScroller setEnabled: YES];
|
||||
}
|
||||
|
||||
return;
|
||||
[self display]; // should probably be a setNeedsDisplay FIX ME?
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
//
|
||||
|
@ -1083,6 +1087,8 @@
|
|||
|
||||
// Send the action to target
|
||||
[self sendAction];
|
||||
|
||||
[self display]; // should probably be a setNeedsDisplay FIX ME?
|
||||
}
|
||||
|
||||
- (void)doDoubleClick:(id)sender
|
||||
|
@ -1357,40 +1363,35 @@
|
|||
|
||||
- (void)_adjustMatrixOfColumn:(int)column
|
||||
{
|
||||
NSBrowserColumn *bc;
|
||||
NSScrollView *sc;
|
||||
id matrix;
|
||||
NSSize cs, ms;
|
||||
NSRect mr;
|
||||
NSBrowserColumn *bc;
|
||||
NSScrollView *sc;
|
||||
id matrix;
|
||||
NSSize cs, ms;
|
||||
NSRect mr;
|
||||
|
||||
if (column >= (int)[_browserColumns count])
|
||||
return;
|
||||
if (column >= (int)[_browserColumns count])
|
||||
return;
|
||||
|
||||
bc = [_browserColumns objectAtIndex: column];
|
||||
sc = [bc columnScrollView];
|
||||
matrix = [bc columnMatrix];
|
||||
// Adjust matrix to fit in scrollview
|
||||
if (sc && matrix && [bc isLoaded]) // do it only if column has been loaded
|
||||
{
|
||||
cs = [sc contentSize];
|
||||
ms = [matrix cellSize];
|
||||
ms.width = cs.width;
|
||||
[matrix setCellSize: ms];
|
||||
mr = [matrix frame];
|
||||
|
||||
if (mr.size.height < cs.height) // matrix smaller than
|
||||
{ // scrollview's content
|
||||
mr.origin.y = cs.height; // view requires origin
|
||||
[matrix setFrame: mr]; // adjustment for it to
|
||||
} // appear at top
|
||||
|
||||
bc = [_browserColumns objectAtIndex: column];
|
||||
sc = [bc columnScrollView];
|
||||
matrix = [bc columnMatrix];
|
||||
|
||||
// Adjust matrixes to fit in the scrollview
|
||||
// Only set if column has been loaded
|
||||
if (sc && matrix && [bc isLoaded])
|
||||
{
|
||||
cs = [sc contentSize];
|
||||
[matrix sizeToCells];
|
||||
ms = [matrix cellSize];
|
||||
ms.width = cs.width;
|
||||
[matrix setCellSize: ms];
|
||||
mr = [matrix frame];
|
||||
|
||||
#if 0
|
||||
// Adjust because NSMatrix has incorrect origin
|
||||
if (mr.size.height < cs.height)
|
||||
{
|
||||
mr.origin.y = cs.height - mr.size.height;
|
||||
[matrix setFrame: mr];
|
||||
}
|
||||
#endif
|
||||
[sc setDocumentView: matrix];
|
||||
}
|
||||
[sc setDocumentView: matrix];
|
||||
}
|
||||
}
|
||||
|
||||
- (void)_adjustScrollerFrameOfColumn:(int)column force:(BOOL)flag
|
||||
|
@ -1555,4 +1556,12 @@
|
|||
}
|
||||
}
|
||||
|
||||
- (void)setFrame:(NSRect)frameRect
|
||||
{
|
||||
NSLog (@"NSBrowser setFrame ");
|
||||
[super setFrame:frameRect];
|
||||
[self tile]; // recalc browser's elements
|
||||
[self _adjustScrollerFrames:YES]; // adjust browser's matrix
|
||||
}
|
||||
|
||||
@end
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue