Display Toolbar as a mainWindow

idvr · Feb 26, 2014 · dc65ef3 · dc65ef3
1 parent 099103d
commit dc65ef3
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 26 deletions.
diff --git a/DCMView.m b/DCMView.m
@@ -4955,6 +4955,8 @@ - (void)scrollWheel:(NSEvent *)theEvent
 				[[self windowController] propagateSettings];
 
 			[self setNeedsDisplay:YES];
+
+            [self displayIfNeeded];
 		}
     }
 }
@@ -6799,7 +6801,7 @@ -(void) sync:(NSNotification*)note
         if( [[self windowController] windowWillClose])
             return;
 
-		if( avoidRecursiveSync > 2) return;
+		if( avoidRecursiveSync > 0) return;
 		avoidRecursiveSync++;
 
 		if( [note object] != self && isKeyView == YES && matrix == 0 && curImage > -1)

diff --git a/Preference Panes/OSIViewerPreferencePane/OSIViewerPreferencePanePref.m b/Preference Panes/OSIViewerPreferencePane/OSIViewerPreferencePanePref.m
@@ -91,27 +91,3 @@ - (AppController*) appController
 	return [AppController sharedAppController];
 }
 @end
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/ToolBarNSWindow.m b/ToolBarNSWindow.m
@@ -20,9 +20,13 @@
 
 @implementation ToolBarNSWindow
 
+- (void) resignMainWindow
+{
+}
+
 - (BOOL) canBecomeMainWindow
 {
-	return NO;
+	return YES;
 }
 
 - (BOOL) canBecomeKeyWindow

diff --git a/ToolbarPanel.m b/ToolbarPanel.m
@@ -85,6 +85,7 @@ - (id)initForViewer:(ViewerController *)v withToolbar:(NSToolbar *)t
         [[self window] setAnimationBehavior: NSWindowAnimationBehaviorNone];
         [[self window] setToolbar: toolbar];
         [[self window] setLevel: NSNormalWindowLevel];
+        [[self window] makeMainWindow];
 
         [toolbar setShowsBaselineSeparator: NO];
         [toolbar setVisible: YES];

diff --git a/ViewerController.m b/ViewerController.m
@@ -8129,6 +8129,7 @@ -(void) changeImageData:(NSMutableArray*)f :(NSMutableArray*)d :(NSData*) v :(BO
 					[movieRateSlider setEnabled: NO];
 					[moviePosSlider setEnabled: NO];
 					[moviePlayStop setEnabled:NO];
+
 					[speedText setStringValue:[NSString stringWithFormat:NSLocalizedString(@"%0.1f im/s",  @"im/s = images per second"), (float) [self frameRate]*direction]];
 
 					[seriesView setPixels:pixList[0] files:fileList[0] rois:roiList[0] firstImage: 0 level:'i' reset:!sameSeries];
Original file line number	Diff line number	Diff line change
Expand Up		@@ -91,27 +91,3 @@ - (AppController*) appController
		return [AppController sharedAppController];
		}
		@end