Merge branch 'arc'

1 files changed, 7 insertions, 2 deletions

diff --git a/tikzit/src/osx/PropertyInspectorController.m b/tikzit/src/osx/PropertyInspectorController.m
index 1411549..039a30f 100644
--- a/tikzit/src/osx/PropertyInspectorController.m
+++ b/tikzit/src/osx/PropertyInspectorController.m
@@ -25,7 +25,7 @@
 @synthesize sourceAnchorNames, targetAnchorNames;
 
 - (id)initWithWindowNibName:(NSString *)windowNibName {
-	[super initWithWindowNibName:windowNibName];
+	if (!(self = [super initWithWindowNibName:windowNibName])) return nil;
     
     noSelection = [[GraphElementData alloc] init];
     [noSelection setProperty:@"" forKey:@"No Selection"];
@@ -56,7 +56,12 @@
     [self setTargetAnchorNames: [[NSMutableArray alloc] initWithArray:[@"north south west east" componentsSeparatedByString:@" "]]];
 
     
-    [[self window] setLevel:NSNormalWindowLevel];
+    if ([[NSUserDefaults standardUserDefaults] boolForKey:@"net.sourceforge.tikzit.inspectorsontop"] == YES) {
+        [[self window] setLevel:NSFloatingWindowLevel];
+    } else {
+        [[self window] setLevel:NSNormalWindowLevel];
+    }
+
     [self showWindow:self];
 	return self;
 }