From 0895d7ea4f8f4cbd142694c55fb859a6db59389b Mon Sep 17 00:00:00 2001 From: richard Date: Tue, 27 Apr 1999 14:56:43 +0000 Subject: [PATCH] Misc fixes for Tims FileViewer app git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@4148 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 11 ++++++++++- Images/GNUmakefile | 2 ++ Images/common_3DArrowRight.tiff | Bin 0 -> 366 bytes Images/common_3DArrowRightH.tiff | Bin 0 -> 350 bytes Model/GMAppKit.m | 11 ++++++++--- Model/IMCustomObject.m | 5 ++++- Source/NSBrowserCell.m | 4 ++-- 7 files changed, 26 insertions(+), 7 deletions(-) create mode 100644 Images/common_3DArrowRight.tiff create mode 100644 Images/common_3DArrowRightH.tiff diff --git a/ChangeLog b/ChangeLog index a93ec7845..ab39d1764 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,14 @@ -Mon Apr 26 7:05:00 1999 Richard Frith-Macdonald +Tue Apr 27 15:10:00 1999 Richard Frith-Macdonald + 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 Changes based on report by Marc.Champesme@lipn.univ-paris13.fr * Headers/AppKit/NSHelpPanel.h: place in #ifndef STRICT_MACOS_X diff --git a/Images/GNUmakefile b/Images/GNUmakefile index 0be3f0e41..f284732c9 100644 --- a/Images/GNUmakefile +++ b/Images/GNUmakefile @@ -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 \ diff --git a/Images/common_3DArrowRight.tiff b/Images/common_3DArrowRight.tiff new file mode 100644 index 0000000000000000000000000000000000000000..47a857bf64b6e84ddd0a49771bef04b6313b5f47 GIT binary patch literal 366 zcmebD)MD^sU|?WmVEN>4x}rW*v8kPBp;pKZgMZA79O5bw0jmO)TslOIOHRB9Og_RV zqaF7n&`@Squ#9ATyEJOh7gZP>cg8 z$qW@|1@hUTY$hO^3yICk$i(0d6cYfd=L53Efb0k$Tab|jY(58&F9cN&vQHGs2H7D7 zWvc)s#G&flfZ{Sp>VuHjKq&?eDAX@4F4E7*PfpCyclQe|E=euW_sL8uN-WAuE!Gc8 zEzU13N(Qn#a}(2nRC0c9Zhl_8v5R9-QGR()W_m`6UP)$J8UurKQEFmIYKlU6W=V!Z NNJgrHyQgme0|49xKwJO- literal 0 HcmV?d00001 diff --git a/Images/common_3DArrowRightH.tiff b/Images/common_3DArrowRightH.tiff new file mode 100644 index 0000000000000000000000000000000000000000..d4cb7f40fc7a591056ee0cf7b605fb1f07fc0a30 GIT binary patch literal 350 zcmebD)MBt>U|?We!S-pr){6fR6rI|*WIM7}ELhdV!Y!*-Fy+HRr4}w}+q@GIg^yVK zMYU5733w{0cTF}4{L;V=)X2=h2-MFGG6RXt1Z1-S#eM)WGgO=v$Yz7GnSg9ABsMQ2 z6N3j(3}hG|kSzvedH~sij4WXDIe>g2sCtlnqEI%-4lyWO1t=j7Rc{6qmqAh=gv16) zF>pYkera)$eolUJVvfGMUubbjYJt8_W>QgNQD$nfeo$(0erZuMkmZ@1m=2_p^K*0a v^Wu$N9E*zb%Y!o0GfF)4N;1>Z7@Uhz6H8K46v{J8G895GQWe}ieFGQ(*a19W literal 0 HcmV?d00001 diff --git a/Model/GMAppKit.m b/Model/GMAppKit.m index 8b00ed126..17516e18a 100644 --- a/Model/GMAppKit.m +++ b/Model/GMAppKit.m @@ -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; } diff --git a/Model/IMCustomObject.m b/Model/IMCustomObject.m index 61a57b213..b47a515de 100644 --- a/Model/IMCustomObject.m +++ b/Model/IMCustomObject.m @@ -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); } diff --git a/Source/NSBrowserCell.m b/Source/NSBrowserCell.m index d4fd2fe8e..a0bcb5eec 100644 --- a/Source/NSBrowserCell.m +++ b/Source/NSBrowserCell.m @@ -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"]); } }