diff --git a/ChangeLog b/ChangeLog index 9f996a81..65d7a92d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2003-03-02 Richard Frith-Macdonald + + * GormDocument.m: Give scrollviews bezelled border. + 2003-02-13 Richard Frith-Macdonald * GormOutlineView.m: Fix code to update view when outlet/action diff --git a/GormDocument.m b/GormDocument.m index 3bd5441c..1f563fb1 100644 --- a/GormDocument.m +++ b/GormDocument.m @@ -1478,7 +1478,7 @@ static NSImage *classesImage = nil; objToName = NSCreateMapTableWithZone(NSObjectMapKeyCallBacks, NSObjectMapValueCallBacks, 128, [self zone]); - // for saving objects when the gorm file is persisted. Used for templates. + // saving objects when the gorm file is persisted. Used for templates. tempNameTable = [[NSMutableDictionary alloc] initWithCapacity: 8]; // for saving the editors when the gorm file is persisted. @@ -1592,12 +1592,16 @@ static NSImage *classesImage = nil; scrollView = [[NSScrollView alloc] initWithFrame: scrollRect]; [scrollView setHasVerticalScroller: YES]; [scrollView setHasHorizontalScroller: NO]; - [scrollView setAutoresizingMask: NSViewHeightSizable|NSViewWidthSizable]; + [scrollView setAutoresizingMask: + NSViewHeightSizable|NSViewWidthSizable]; + [scrollView setBorderType: NSBezelBorder]; + objectsView = [[GormObjectEditor alloc] initWithObject: nil - inDocument: self]; + inDocument: self]; AUTORELEASE(objectsView); [objectsView setFrame: mainRect]; - [objectsView setAutoresizingMask: NSViewHeightSizable|NSViewWidthSizable]; + [objectsView setAutoresizingMask: + NSViewHeightSizable|NSViewWidthSizable]; [scrollView setDocumentView: objectsView]; RELEASE(objectsView); @@ -1606,9 +1610,12 @@ static NSImage *classesImage = nil; imagesScrollView = [[NSScrollView alloc] initWithFrame: scrollRect]; [imagesScrollView setHasVerticalScroller: YES]; [imagesScrollView setHasHorizontalScroller: NO]; - [imagesScrollView setAutoresizingMask: NSViewHeightSizable|NSViewWidthSizable]; + [imagesScrollView setAutoresizingMask: + NSViewHeightSizable|NSViewWidthSizable]; + [imagesScrollView setBorderType: NSBezelBorder]; + imagesView = [[GormImageEditor alloc] initWithObject: nil - inDocument: self]; + inDocument: self]; AUTORELEASE(imagesView); [imagesView setFrame: mainRect]; [imagesView setAutoresizingMask: NSViewHeightSizable|NSViewWidthSizable]; @@ -1620,9 +1627,12 @@ static NSImage *classesImage = nil; soundsScrollView = [[NSScrollView alloc] initWithFrame: scrollRect]; [soundsScrollView setHasVerticalScroller: YES]; [soundsScrollView setHasHorizontalScroller: NO]; - [soundsScrollView setAutoresizingMask: NSViewHeightSizable|NSViewWidthSizable]; + [soundsScrollView setAutoresizingMask: + NSViewHeightSizable|NSViewWidthSizable]; + [soundsScrollView setBorderType: NSBezelBorder]; + soundsView = [[GormSoundEditor alloc] initWithObject: nil - inDocument: self]; + inDocument: self]; AUTORELEASE(soundsView); [soundsView setFrame: mainRect]; [soundsView setAutoresizingMask: NSViewHeightSizable|NSViewWidthSizable]; @@ -1634,7 +1644,8 @@ static NSImage *classesImage = nil; [classesScrollView setHasVerticalScroller: YES]; [classesScrollView setHasHorizontalScroller: NO]; [classesScrollView setAutoresizingMask: - NSViewHeightSizable|NSViewWidthSizable]; + NSViewHeightSizable|NSViewWidthSizable]; + [classesScrollView setBorderType: NSBezelBorder]; mainRect.origin = NSMakePoint(0,0); classesView = [[GormOutlineView alloc] initWithFrame: mainRect]; diff --git a/GormInspectorsManager.m b/GormInspectorsManager.m index 1afd5535..b1183e7b 100644 --- a/GormInspectorsManager.m +++ b/GormInspectorsManager.m @@ -364,12 +364,10 @@ } // Operate on the document view if the selected object is a NSScrollView - if ([obj isKindOfClass: [NSScrollView class]] && - ([(NSScrollView *)obj documentView] != nil) && - ([[(NSScrollView *)obj documentView] isKindOfClass: [NSTableView class]] - || [[(NSScrollView *)obj documentView] isKindOfClass: [NSTextView class]]) - - ) + if ([obj isKindOfClass: [NSScrollView class]] + && ([(NSScrollView *)obj documentView] != nil) + && ([[(NSScrollView *)obj documentView] isKindOfClass: [NSTableView class]] + || [[(NSScrollView *)obj documentView] isKindOfClass: [NSTextView class]])) { obj = [(NSScrollView *)obj documentView]; } diff --git a/GormPalettesManager.m b/GormPalettesManager.m index 4b4821b3..64cdb49c 100644 --- a/GormPalettesManager.m +++ b/GormPalettesManager.m @@ -260,6 +260,8 @@ static NSImage *dragImage = nil; [scrollView setHasHorizontalScroller: YES]; [scrollView setHasVerticalScroller: NO]; [scrollView setAutoresizingMask: NSViewMinYMargin | NSViewWidthSizable]; + [scrollView setBorderType: NSBezelBorder]; + selectionView = [[NSMatrix alloc] initWithFrame: selectionRect mode: NSRadioModeMatrix cellClass: [NSImageCell class] diff --git a/GormViewWithContentViewEditor.m b/GormViewWithContentViewEditor.m index f35919ed..5ec92706 100644 --- a/GormViewWithContentViewEditor.m +++ b/GormViewWithContentViewEditor.m @@ -960,6 +960,7 @@ scrollView = [[NSScrollView alloc] initWithFrame: rect]; [scrollView setHasHorizontalScroller: YES]; [scrollView setHasVerticalScroller: YES]; + [scrollView setBorderType: NSBezelBorder]; [document attachObject: scrollView toParent: _editedObject];