gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-04-22 18:11:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

Misc fixes for Tims FileViewer app

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@4148 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 1999-04-27 14:56:43 +00:00
parent 1a73bbbaf7
commit d13cc54126
7 changed files with 26 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
ChangeLog
View file

@ -1,5 +1,14 @@
Mon Apr 26 7:05:00 1999 Richard Frith-Macdonald <richard@brainstorm.co.uk>
Tue Apr 27 15:10:00 1999 Richard Frith-Macdonald <richard@brainstorm.co.uk>
Changes supplied by Tim.Bissell@dresdnerkb.com
* Source/NSBrowserCell.m: Use 3d arrow images.
* Images/GNUmakefile: Add 3d images
* Images/common_3DArrowRight.tiff: new file
* Images/common_3DArrowRightH.tiff: new file
* Model/IMCustomObject.m: minor bugfixes
* Model/GMAppKit.m: Partial fixes to handle window sizes correctly.
Mon Apr 26 7:05:00 1999 Richard Frith-Macdonald <richard@brainstorm.co.uk>
Changes based on report by Marc.Champesme@lipn.univ-paris13.fr
* Headers/AppKit/NSHelpPanel.h: place in #ifndef STRICT_MACOS_X

2
Images/GNUmakefile
View file

@ -36,10 +36,12 @@ GNUstep_Images_Copyright \
common_ArrowDown.tiff \
common_ArrowUp.tiff \
common_ArrowRight.tiff \
common_3DArrowRight.tiff \
common_ArrowLeft.tiff \
common_ArrowDownH.tiff \
common_ArrowUpH.tiff \
common_ArrowRightH.tiff \
common_3DArrowRightH.tiff \
common_ArrowLeftH.tiff \
common_Close.tiff \
common_CloseH.tiff \

BIN
Images/common_3DArrowRight.tiff Normal file
View file

Binary file not shown.

BIN
Images/common_3DArrowRightH.tiff Normal file
View file

Binary file not shown.

11
Model/GMAppKit.m
View file

@ -114,6 +114,8 @@ void __dummy_GMAppKit_functionForLinking() {}
{
[super encodeWithModelArchiver:archiver];
[archiver encodeSize:[self contentViewMargins]
withName:@"contentViewMargins"];
[archiver encodeInt:[self borderType] withName:@"borderType"];
[archiver encodeInt:[self titlePosition] withName:@"titlePosition"];
[archiver encodeString:[self title] withName:@"title"];
@ -125,6 +127,7 @@ void __dummy_GMAppKit_functionForLinking() {}
{
self = [super initWithModelUnarchiver:unarchiver];
[self setContentViewMargins:[unarchiver decodeSizeWithName:@"contentViewMargins"]];
[self setBorderType:[unarchiver decodeIntWithName:@"borderType"]];
[self setTitlePosition:[unarchiver decodeIntWithName:@"titlePosition"]];
[self setTitle:[unarchiver decodeStringWithName:@"title"]];
@ -965,7 +968,7 @@ void __dummy_GMAppKit_functionForLinking() {}
- (void)encodeWithModelArchiver:(GMArchiver*)archiver
{
[archiver encodeRect:[self frame] withName:@"frame"];
[archiver encodeRect:[[self contentView]frame] withName:@"contentFrame"];
[archiver encodeSize:[self maxSize] withName:@"maxSize"];
[archiver encodeSize:[self minSize] withName:@"minSize"];
[archiver encodeString:[self frameAutosaveName]
@ -990,12 +993,14 @@ void __dummy_GMAppKit_functionForLinking() {}
{
unsigned backingType = [unarchiver decodeUnsignedIntWithName:@"backingType"];
unsigned styleMask = [unarchiver decodeUnsignedIntWithName:@"styleMask"];
NSRect aRect = [unarchiver decodeRectWithName:@"frame"];
NSRect ctRect = [unarchiver decodeRectWithName:@"contentFrame"];
NSWindow* win = [[[NSWindow allocWithZone:[unarchiver objectZone]]
initWithContentRect:aRect
initWithContentRect:ctRect
styleMask:styleMask backing:backingType defer:YES]
autorelease];
// printf("content: %g, %g -- frame %g, %g\n", ctRect.size.width, ctRect.size.height, [win frame].size.width, [win frame].size.height);
return win;
}

5
Model/IMCustomObject.m
View file

@ -106,16 +106,19 @@ extern BOOL _fileOwnerDecoded;
customView->extension = [unarchiver decodeObjectWithName:@"extension"];
customView->realObject = [unarchiver decodeObjectWithName:@"realObject"];
customView->realObject = _nibOwner;
[customView setFrame:[unarchiver decodeRectWithName:@"frame"]];
return customView;
}
customView->className = [unarchiver decodeStringWithName:@"className"];
customView->extension = [unarchiver decodeObjectWithName:@"extension"];
customView->realObject = [unarchiver decodeObjectWithName:@"realObject"];
[customView setFrame:[unarchiver decodeRectWithName:@"frame"]];
class = NSClassFromString (customView->className);
if (class)
customView->realObject = [[class alloc] init];
customView->realObject = [[class alloc] initWithFrame:[customView frame]];
else {
NSLog (@"Class %@ not linked into application!", customView->className);
}

4
Source/NSBrowserCell.m
View file

@ -86,8 +86,8 @@ static NSImage *highlight_image;
if (self == [NSBrowserCell class])
{
[self setVersion: 1];
ASSIGN(branch_image, [NSImage imageNamed: @"common_ArrowRight"]);
ASSIGN(highlight_image, [NSImage imageNamed: @"common_ArrowRightH"]);
ASSIGN(branch_image, [NSImage imageNamed: @"common_3DArrowRight"]);
ASSIGN(highlight_image, [NSImage imageNamed: @"common_3DArrowRightH"]);
}
}