mirror of
https://github.com/gnustep/apps-gorm.git
synced 2025-02-23 19:51:00 +00:00
Corrected minor inspector sizing problem.
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/apps/gorm/trunk@21718 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
6dc0477648
commit
90a920d9cb
4 changed files with 16 additions and 3 deletions
|
@ -1,3 +1,11 @@
|
||||||
|
2005-09-15 00:53 Gregory John Casamento <greg_casamento@yahoo.com>
|
||||||
|
|
||||||
|
* GormCore/GormInspectorsManager.[mh]: Added origFrame to allow
|
||||||
|
resetting the inspectorView frame to it's original size in
|
||||||
|
setCurrentInspector:.
|
||||||
|
* GormCore/GormPalettesManager.m: Removed old commented out code
|
||||||
|
in init.
|
||||||
|
|
||||||
2005-09-12 22:15 Gregory John Casamento <greg_casamento@yahoo.com>
|
2005-09-12 22:15 Gregory John Casamento <greg_casamento@yahoo.com>
|
||||||
|
|
||||||
* GNUmakefile: Copy the .gorm file into the Resources.
|
* GNUmakefile: Copy the .gorm file into the Resources.
|
||||||
|
|
|
@ -28,6 +28,7 @@
|
||||||
|
|
||||||
#include <Foundation/NSObject.h>
|
#include <Foundation/NSObject.h>
|
||||||
#include <InterfaceBuilder/IBInspectorManager.h>
|
#include <InterfaceBuilder/IBInspectorManager.h>
|
||||||
|
#include <Foundation/NSGeometry.h>
|
||||||
|
|
||||||
@class NSPanel;
|
@class NSPanel;
|
||||||
@class NSMutableDictionary;
|
@class NSMutableDictionary;
|
||||||
|
@ -48,6 +49,7 @@
|
||||||
IBOutlet IBInspector *inspector;
|
IBOutlet IBInspector *inspector;
|
||||||
int current;
|
int current;
|
||||||
BOOL hiddenDuringTest;
|
BOOL hiddenDuringTest;
|
||||||
|
NSRect origFrame;
|
||||||
}
|
}
|
||||||
- (NSPanel*) panel;
|
- (NSPanel*) panel;
|
||||||
- (void) setClassInspector;
|
- (void) setClassInspector;
|
||||||
|
|
|
@ -160,6 +160,9 @@
|
||||||
[cache setObject: inspector forKey: @"GormMultipleInspector"];
|
[cache setObject: inspector forKey: @"GormMultipleInspector"];
|
||||||
DESTROY(inspector);
|
DESTROY(inspector);
|
||||||
|
|
||||||
|
// get the original framesize.
|
||||||
|
origFrame = [inspectorView frame];
|
||||||
|
|
||||||
[self setCurrentInspector: 0];
|
[self setCurrentInspector: 0];
|
||||||
|
|
||||||
[nc addObserver: self
|
[nc addObserver: self
|
||||||
|
@ -427,8 +430,8 @@
|
||||||
rect.size.height = [selectionView frame].origin.y;
|
rect.size.height = [selectionView frame].origin.y;
|
||||||
buttonsRect = rect;
|
buttonsRect = rect;
|
||||||
buttonsRect.size.height = IVB;
|
buttonsRect.size.height = IVB;
|
||||||
rect.origin.y += IVB + 2;
|
rect.origin.y += IVB;
|
||||||
rect.size.height -= IVB;
|
rect.size.height -= (IVB + 3);
|
||||||
|
|
||||||
buttonView = [[NSView alloc] initWithFrame: buttonsRect];
|
buttonView = [[NSView alloc] initWithFrame: buttonsRect];
|
||||||
[buttonView setAutoresizingMask:
|
[buttonView setAutoresizingMask:
|
||||||
|
@ -458,6 +461,7 @@
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
rect = origFrame;
|
||||||
[buttonView removeFromSuperview];
|
[buttonView removeFromSuperview];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -282,7 +282,6 @@ static NSImage *dragImage = nil;
|
||||||
unsigned int style = NSTitledWindowMask | NSClosableWindowMask | NSResizableWindowMask;
|
unsigned int style = NSTitledWindowMask | NSClosableWindowMask | NSResizableWindowMask;
|
||||||
NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
|
NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
|
||||||
NSArray *userPalettes = [defaults arrayForKey: USER_PALETTES];
|
NSArray *userPalettes = [defaults arrayForKey: USER_PALETTES];
|
||||||
// NSArray *builtinPalettes = [defaults arrayForKey: BUILTIN_PALETTES];
|
|
||||||
|
|
||||||
panel = [[GormPalettePanel alloc] initWithContentRect: contentRect
|
panel = [[GormPalettePanel alloc] initWithContentRect: contentRect
|
||||||
styleMask: style
|
styleMask: style
|
||||||
|
|
Loading…
Reference in a new issue