/* $Id: PictureController.mm,v 1.11 2005/08/01 15:10:44 titer Exp $
This file is part of the HandBrake source code.
- Homepage: <http://handbrake.m0k.org/>.
+ Homepage: <http://handbrake.fr/>.
It may be used under the terms of the GNU General Public License. */
-#include "PictureController.h"
+#import "PictureController.h"
+#import "Controller.h"
+#import "HBPreviewController.h"
+#import "HBFilterController.h"
-@interface PictureController (Private)
-- (NSSize)optimalViewSizeForImageSize: (NSSize)imageSize;
-- (void)resizeSheetForViewSize: (NSSize)viewSize;
-- (void)setViewSize: (NSSize)viewSize;
-- (BOOL)viewNeedsToResizeToSize: (NSSize)newSize;
+@implementation PictureController
-@end
+- (id)init
+{
+ if (self = [super initWithWindowNibName:@"PictureSettings"])
+ {
+ // NSWindowController likes to lazily load its window. However since
+ // this controller tries to set all sorts of outlets before the window
+ // is displayed, we need it to load immediately. The correct way to do
+ // this, according to the documentation, is simply to invoke the window
+ // getter once.
+ //
+ // If/when we switch a lot of this stuff to bindings, this can probably
+ // go away.
+ [self window];
+
+ fPreviewController = [[PreviewController alloc] init];
+ //fPictureFilterController = [[PictureFilterController alloc] init];
+ }
+ return self;
+}
-static int GetAlignedSize( int size )
+//------------------------------------------------------------------------------------
+// Displays and brings the picture window to the front
+//------------------------------------------------------------------------------------
+- (IBAction) showPictureWindow: (id)sender
{
- int result = 1;
- while( result < size )
+ if ([[self window] isVisible])
{
- result *= 2;
+ [[self window] close];
+ }
+ else
+ {
+ [self showWindow:sender];
+ [[NSUserDefaults standardUserDefaults] setBool:YES forKey:@"PictureSizeWindowIsOpen"];
+ if ([fPreviewController fullScreen] == YES)
+ {
+ [self setToFullScreenMode];
+ }
+ else
+ {
+ [self setToWindowedMode];
+ }
}
- return result;
}
-@implementation PictureController
+- (BOOL) previewFullScreenMode
+{
+ return [fPreviewController fullScreen];
+}
-- (id)initWithDelegate:(id)del
+- (IBAction) previewGoWindowed: (id)sender
{
- if (self = [super init])
- {
- delegate = del;
- [self loadMyNibFile];
- }
- return self;
+ [fPreviewController goWindowedScreen:self];
}
-- (void) SetHandle: (hb_handle_t *) handle
+- (IBAction) showPreviewWindow: (id)sender
{
- fHandle = handle;
+ [fPreviewController showWindow:sender];
+}
+
+- (IBAction) showFilterWindow: (id)sender
+{
+ [fHBController showFiltersPanel:sender];
+}
+
+
+- (void) setToFullScreenMode
+{
+ int32_t shieldLevel = CGShieldingWindowLevel();
+
+ [fPictureWindow setLevel:shieldLevel + 1];
+ // Show the window.
+ [fPictureWindow makeKeyAndOrderFront:self];
+}
+
+- (void) setToWindowedMode
+{
+ /* Set the window back to regular level */
+ [[self window] setLevel:NSNormalWindowLevel];
+}
+
+- (void)setHBController: (HBController *)controller
+{
+ fHBController = controller;
+ //[fPictureFilterController setHBController: controller];
+ [fPreviewController setHBController: controller];
+
+}
- fHasQE = CGDisplayUsesOpenGLAcceleration( kCGDirectMainDisplay );
+- (void)awakeFromNib
+{
+ [fPictureWindow setDelegate:self];
+ if( ![[self window] setFrameUsingName:@"PictureSizing"] )
+ [[self window] center];
+ [self setWindowFrameAutosaveName:@"PictureSizing"];
+ [[self window] setExcludedFromWindowsMenu:YES];
+}
+
+
+- (void)windowWillClose:(NSNotification *)aNotification
+{
+[[NSUserDefaults standardUserDefaults] setBool:NO forKey:@"PictureSizeWindowIsOpen"];
+}
+
+- (BOOL)windowShouldClose:(id)fPictureWindow
+{
+ return YES;
+}
- fBuffer = NULL;
- fBufferSize = 0;
- fTexBuf[0] = NULL;
- fTexBuf[1] = NULL;
- fTexBufSize = 0;
+- (void) dealloc
+{
+ [fPictureFilterController release];
+ [fPreviewController release];
+ [super dealloc];
+}
+- (void) SetHandle: (hb_handle_t *) handle
+{
+ fHandle = handle;
+
[fWidthStepper setValueWraps: NO];
[fWidthStepper setIncrement: 16];
[fWidthStepper setMinValue: 64];
[fHeightStepper setValueWraps: NO];
[fHeightStepper setIncrement: 16];
[fHeightStepper setMinValue: 64];
-
+
[fCropTopStepper setIncrement: 2];
[fCropTopStepper setMinValue: 0];
[fCropBottomStepper setIncrement: 2];
[fCropLeftStepper setMinValue: 0];
[fCropRightStepper setIncrement: 2];
[fCropRightStepper setMinValue: 0];
+
+ [fPreviewController SetHandle: fHandle];
+ [fPictureFilterController SetHandle: fHandle];
+
+
}
- (void) SetTitle: (hb_title_t *) title
hb_job_t * job = title->job;
fTitle = title;
-
- /* Make sure we have big enough buffers */
- int newSize;
- newSize = ( title->width + 2 ) * (title->height + 2 ) * 4;
- if( fBufferSize < newSize )
- {
- fBufferSize = newSize;
- fBuffer = (uint8_t *) realloc( fBuffer, fBufferSize );
- }
- if( !fHasQE )
- {
- newSize = ( GetAlignedSize( title->width + 2 ) *
- GetAlignedSize( title->height + 2 ) * 4 );
- }
- if( fTexBufSize < newSize )
- {
- fTexBufSize = newSize;
- fTexBuf[0] = (uint8_t *) realloc( fTexBuf[0], fTexBufSize );
- fTexBuf[1] = (uint8_t *) realloc( fTexBuf[1], fTexBufSize );
- }
-
-
+
+
+
[fWidthStepper setMaxValue: title->width];
[fWidthStepper setIntValue: job->width];
[fWidthField setIntValue: job->width];
{
[fAnamorphicPopUp addItemWithTitle: @"Loose"];
}
- [fAnamorphicPopUp selectItemAtIndex: job->pixel_ratio];
+ [fAnamorphicPopUp selectItemAtIndex: job->anamorphic.mode];
/* We initially set the previous state of keep ar to on */
keepAspectRatioPreviousState = 1;
}
/* Set filters widgets according to the filters struct */
- [fVFRCheck setState:fPictureFilterSettings.vfr];
- [fDetelecineCheck setState:fPictureFilterSettings.detelecine];
+ /* this has now been movied to the filters controller */
+ /*
+ [fDetelecineCheck setState:fPictureFilterSettings.detelecine];
[fDeinterlacePopUp selectItemAtIndex: fPictureFilterSettings.deinterlace];
[fDenoisePopUp selectItemAtIndex: fPictureFilterSettings.denoise];
[fDeblockCheck setState: fPictureFilterSettings.deblock];
+ [fDecombCheck setState: fPictureFilterSettings.decomb];
+ */
fPicture = 0;
MaxOutputWidth = title->width - job->crop[2] - job->crop[3];
MaxOutputHeight = title->height - job->crop[0] - job->crop[1];
+
[self SettingsChanged: nil];
}
-/* we use this to setup the initial picture filters upon first launch, after that their states
-are maintained across different sources */
-- (void) setInitialPictureFilters
-{
- /* we use a popup to show the deinterlace settings */
- [fDeinterlacePopUp removeAllItems];
- [fDeinterlacePopUp addItemWithTitle: @"None"];
- [fDeinterlacePopUp addItemWithTitle: @"Fast"];
- [fDeinterlacePopUp addItemWithTitle: @"Slow"];
- [fDeinterlacePopUp addItemWithTitle: @"Slower"];
- [fDeinterlacePopUp addItemWithTitle: @"Slowest"];
- /* Set deinterlaces level according to the integer in the main window */
- [fDeinterlacePopUp selectItemAtIndex: fPictureFilterSettings.deinterlace];
-
- /* we use a popup to show the denoise settings */
- [fDenoisePopUp removeAllItems];
- [fDenoisePopUp addItemWithTitle: @"None"];
- [fDenoisePopUp addItemWithTitle: @"Weak"];
- [fDenoisePopUp addItemWithTitle: @"Medium"];
- [fDenoisePopUp addItemWithTitle: @"Strong"];
- /* Set denoises level according to the integer in the main window */
- [fDenoisePopUp selectItemAtIndex: fPictureFilterSettings.denoise];
-}
-- (void) Display: (int) anim
+- (IBAction) SettingsChanged: (id) sender
{
- hb_get_preview( fHandle, fTitle, fPicture, fBuffer );
-
- /* Backup previous picture (for effects) */
- memcpy( fTexBuf[1], fTexBuf[0], fTexBufSize );
+ hb_job_t * job = fTitle->job;
- if( fHasQE )
+ autoCrop = ( [fCropMatrix selectedRow] == 0 );
+ [fCropTopStepper setEnabled: !autoCrop];
+ [fCropBottomStepper setEnabled: !autoCrop];
+ [fCropLeftStepper setEnabled: !autoCrop];
+ [fCropRightStepper setEnabled: !autoCrop];
+
+ if( autoCrop )
{
- /* Simply copy */
- memcpy( fTexBuf[0], fBuffer, fTexBufSize );
+ memcpy( job->crop, fTitle->crop, 4 * sizeof( int ) );
}
else
{
- /* Copy line by line */
- uint8_t * in = fBuffer;
- uint8_t * out = fTexBuf[0];
-
- for( int i = fTitle->height + 2; i--; )
- {
- memcpy( out, in, 4 * ( fTitle->width + 2 ) );
- in += 4 * ( fTitle->width + 2 );
- out += 4 * GetAlignedSize( fTitle->width + 2 );
- }
-
- }
-
- if( [fEffectsCheck state] == NSOffState )
- {
- anim = HB_ANIMATE_NONE;
- }
- else if( [[NSApp currentEvent] modifierFlags] & NSShiftKeyMask )
- {
- anim |= HB_ANIMATE_SLOW;
- }
-
- [fPictureGLView Display: anim buffer1: fTexBuf[0]
- buffer2: fTexBuf[1] width: ( fTitle->width + 2 )
- height: ( fTitle->height + 2 )];
-
- NSSize displaySize = NSMakeSize( (float)fTitle->width, (float)fTitle->height );
- /* Set the picture size display fields below the Preview Picture*/
- if( fTitle->job->pixel_ratio == 1 ) // Original PAR Implementation
- {
- output_width = fTitle->width-fTitle->job->crop[2]-fTitle->job->crop[3];
- output_height = fTitle->height-fTitle->job->crop[0]-fTitle->job->crop[1];
- display_width = output_width * fTitle->job->pixel_aspect_width / fTitle->job->pixel_aspect_height;
- [fInfoField setStringValue:[NSString stringWithFormat:
- @"Source: %dx%d, Output: %dx%d, Anamorphic: %dx%d",
- fTitle->width, fTitle->height, output_width, output_height, display_width, output_height]];
- displaySize.width *= ((float)fTitle->job->pixel_aspect_width) / ((float)fTitle->job->pixel_aspect_height);
- }
- else if (fTitle->job->pixel_ratio == 2) // Loose Anamorphic
- {
- display_width = output_width * output_par_width / output_par_height;
- [fInfoField setStringValue:[NSString stringWithFormat:
- @"Source: %dx%d, Output: %dx%d, Anamorphic: %dx%d",
- fTitle->width, fTitle->height, output_width, output_height, display_width, output_height]];
-
- /* FIXME: needs to be fixed so that the picture window does not resize itself on the first
- anamorphic width drop
- */
- if (fTitle->width - 8 < output_width)
- {
- displaySize.width *= ((float)output_par_width) / ((float)output_par_height);
- }
- }
- else // No Anamorphic
- {
- [fInfoField setStringValue: [NSString stringWithFormat:
- @"Source: %dx%d, Output: %dx%d", fTitle->width, fTitle->height,
- fTitle->job->width, fTitle->job->height]];
- }
-
- NSSize viewSize = [self optimalViewSizeForImageSize:displaySize];
- if( [self viewNeedsToResizeToSize:viewSize] )
- {
- [self resizeSheetForViewSize:viewSize];
- [self setViewSize:viewSize];
- }
-
- // Show the scaled text (use the height to check since the width can vary
- // with anamorphic video).
- if( ((int)viewSize.height) != fTitle->height )
- {
- float scale = viewSize.width / ((float)fTitle->width);
- NSString *scaleString = [NSString stringWithFormat:
- NSLocalizedString( @" (Preview scaled to %.0f%% actual size)",
- @"String shown when a preview is scaled" ),
- scale * 100.0];
- [fInfoField setStringValue:
- [[fInfoField stringValue] stringByAppendingString:scaleString]];
+ job->crop[0] = [fCropTopStepper intValue];
+ job->crop[1] = [fCropBottomStepper intValue];
+ job->crop[2] = [fCropLeftStepper intValue];
+ job->crop[3] = [fCropRightStepper intValue];
}
- [fPrevButton setEnabled: ( fPicture > 0 )];
- [fNextButton setEnabled: ( fPicture < 9 )];
-}
-
-- (IBAction) SettingsChanged: (id) sender
-{
- hb_job_t * job = fTitle->job;
-
if( [fAnamorphicPopUp indexOfSelectedItem] > 0 )
{
if ([fAnamorphicPopUp indexOfSelectedItem] == 2) // Loose anamorphic
{
- job->pixel_ratio = 2;
+ job->anamorphic.mode = 2;
[fWidthStepper setEnabled: YES];
[fWidthField setEnabled: YES];
/* We set job->width and call hb_set_anamorphic_size in libhb to do a "dry run" to get
* the values to be used by libhb for loose anamorphic
*/
+ /* if the sender is the anamorphic popup, then we know that loose anamorphic has just
+ * been turned on, so snap the width to full width for the source.
+ */
+ if (sender == fAnamorphicPopUp)
+ {
+ [fWidthStepper setIntValue: fTitle->width-fTitle->job->crop[2]-fTitle->job->crop[3]];
+ [fWidthField setIntValue: fTitle->width-fTitle->job->crop[2]-fTitle->job->crop[3]];
+ }
job->width = [fWidthStepper intValue];
hb_set_anamorphic_size(job, &output_width, &output_height, &output_par_width, &output_par_height);
[fHeightStepper setIntValue: output_height];
job->width = [fWidthStepper intValue];
job->height = [fHeightStepper intValue];
- job->pixel_ratio = 1;
+ job->anamorphic.mode = 1;
[fWidthStepper setEnabled: NO];
[fWidthField setEnabled: NO];
}
{
job->width = [fWidthStepper intValue];
job->height = [fHeightStepper intValue];
- job->pixel_ratio = 0;
+ job->anamorphic.mode = 0;
[fWidthStepper setEnabled: YES];
[fWidthField setEnabled: YES];
[fHeightStepper setEnabled: YES];
}
-
job->keep_ratio = ( [fRatioCheck state] == NSOnState );
-
- fPictureFilterSettings.deinterlace = [fDeinterlacePopUp indexOfSelectedItem];
- /* if the gui deinterlace settings are fast through slowest, the job->deinterlace
- value needs to be set to one, for the job as well as the previews showing deinterlacing
- otherwise set job->deinterlace to 0 or "off" */
- if (fPictureFilterSettings.deinterlace > 0)
- {
- job->deinterlace = 1;
- }
- else
- {
- job->deinterlace = 0;
- }
- fPictureFilterSettings.denoise = [fDenoisePopUp indexOfSelectedItem];
- fPictureFilterSettings.vfr = [fVFRCheck state];
- if (fPictureFilterSettings.vfr > 0)
- {
- [fDetelecineCheck setState:NSOnState];
- [fDetelecineCheck setEnabled: NO];
- }
- else
- {
- [fDetelecineCheck setEnabled: YES];
- }
- fPictureFilterSettings.detelecine = [fDetelecineCheck state];
- fPictureFilterSettings.deblock = [fDeblockCheck state];
- //job->pixel_ratio = ( [fPARCheck state] == NSOnState );
-
- autoCrop = ( [fCropMatrix selectedRow] == 0 );
- [fCropTopStepper setEnabled: !autoCrop];
- [fCropBottomStepper setEnabled: !autoCrop];
- [fCropLeftStepper setEnabled: !autoCrop];
- [fCropRightStepper setEnabled: !autoCrop];
-
- if( autoCrop )
- {
- memcpy( job->crop, fTitle->crop, 4 * sizeof( int ) );
- }
- else
- {
- job->crop[0] = [fCropTopStepper intValue];
- job->crop[1] = [fCropBottomStepper intValue];
- job->crop[2] = [fCropLeftStepper intValue];
- job->crop[3] = [fCropRightStepper intValue];
- }
-
+
if( job->keep_ratio )
{
if( sender == fWidthStepper || sender == fRatioCheck ||
hb_fix_aspect( job, HB_KEEP_WIDTH );
}
}
+ // hb_get_preview can't handle sizes that are larger than the original title
+ // dimensions
+ if( job->width > fTitle->width )
+ job->width = fTitle->width;
+
+ if( job->height > fTitle->height )
+ job->height = fTitle->height;
}
-
+
[fWidthStepper setIntValue: job->width];
[fWidthField setIntValue: job->width];
if( [fAnamorphicPopUp indexOfSelectedItem] < 2 )
[fCropLeftField setIntValue: job->crop[2]];
[fCropRightStepper setIntValue: job->crop[3]];
[fCropRightField setIntValue: job->crop[3]];
+
+ [fPreviewController SetTitle:fTitle];
/* Sanity Check Here for < 16 px preview to avoid
crashing hb_get_preview. In fact, just for kicks
lets getting previews at a min limit of 32, since
no human can see any meaningful detail below that */
if (job->width >= 64 && job->height >= 64)
{
- [self Display: HB_ANIMATE_NONE];
+
+ // Purge the existing picture previews so they get recreated the next time
+ // they are needed.
+ [fPreviewController purgeImageCache];
+ /* We actually call displayPreview now from pictureSliderChanged which keeps
+ * our picture preview slider in sync with the previews being shown
+ */
+
+ //[fPreviewController pictureSliderChanged:nil];
+ [self reloadStillPreview];
}
-}
-- (IBAction) PreviousPicture: (id) sender
-{
- if( fPicture <= 0 )
+ /* we get the sizing info to display from fPreviewController */
+ [fSizeInfoField setStringValue: [fPreviewController pictureSizeInfoString]];
+
+ if (sender != nil)
{
- return;
- }
- fPicture--;
- [self Display: HB_ANIMATE_BACKWARD];
+ [fHBController pictureSettingsDidChange];
+ }
+
}
-- (IBAction) NextPicture: (id) sender
+- (NSString*) getPictureSizeInfoString
{
- if( fPicture >= 9 )
+ return [fSizeInfoField stringValue];
+}
+
+- (void)reloadStillPreview
+{
+ hb_job_t * job = fTitle->job;
+
+ [fPreviewController SetTitle:fTitle];
+ /* Sanity Check Here for < 16 px preview to avoid
+ crashing hb_get_preview. In fact, just for kicks
+ lets getting previews at a min limit of 32, since
+ no human can see any meaningful detail below that */
+ if (job->width >= 64 && job->height >= 64)
{
- return;
+
+ // Purge the existing picture previews so they get recreated the next time
+ // they are needed.
+ [fPreviewController purgeImageCache];
+ /* We actually call displayPreview now from pictureSliderChanged which keeps
+ * our picture preview slider in sync with the previews being shown
+ */
+
+ [fPreviewController pictureSliderChanged:nil];
}
- fPicture++;
- [self Display: HB_ANIMATE_FORWARD];
+
}
-- (IBAction) ClosePanel: (id) sender
-{
- if ([delegate respondsToSelector:@selector(pictureSettingsDidChange)])
- [delegate pictureSettingsDidChange];
-
- [NSApp endSheet: fPicturePanel];
- [fPicturePanel orderOut: self];
-}
+
+#pragma mark -
- (BOOL) autoCrop
{
allowLooseAnamorphic = setting;
}
-- (int) detelecine
-{
- return fPictureFilterSettings.detelecine;
-}
-
-- (void) setDetelecine: (int) setting
-{
- fPictureFilterSettings.detelecine = setting;
-}
-
-- (int) vfr
-{
- return fPictureFilterSettings.vfr;
-}
-
-- (void) setVFR: (int) setting
-{
- fPictureFilterSettings.vfr = setting;
-}
-
-- (int) deinterlace
-{
- return fPictureFilterSettings.deinterlace;
-}
-
-- (void) setDeinterlace: (int) setting {
- fPictureFilterSettings.deinterlace = setting;
-}
-
-- (int) denoise
-{
- return fPictureFilterSettings.denoise;
-}
-
-- (void) setDenoise: (int) setting
-{
- fPictureFilterSettings.denoise = setting;
-}
-
-- (int) deblock
-{
- return fPictureFilterSettings.deblock;
-}
-
-- (void) setDeblock: (int) setting
-{
- fPictureFilterSettings.deblock = setting;
-}
-
-- (void)showPanelInWindow: (NSWindow *)fWindow forTitle: (hb_title_t *)title
+- (IBAction)showPreviewPanel: (id)sender forTitle: (hb_title_t *)title
{
[self SetTitle:title];
-
- [NSApp beginSheet:fPicturePanel
- modalForWindow:fWindow
- modalDelegate:nil
- didEndSelector:nil
- contextInfo:NULL];
-}
+ [self showWindow:sender];
-- (BOOL) loadMyNibFile
-{
- if(![NSBundle loadNibNamed:@"PictureSettings" owner:self])
- {
- NSLog(@"Warning! Could not load myNib file.\n");
- return NO;
- }
-
- return YES;
}
@end
-@implementation PictureController (Private)
-
-//
-// -[PictureController(Private) optimalViewSizeForImageSize:]
-//
-// Given the size of the preview image to be shown, returns the best possible
-// size for the OpenGL view.
-//
-- (NSSize)optimalViewSizeForImageSize: (NSSize)imageSize
-{
- // The min size is 320x240
- float minWidth = 320.0;
- float minHeight = 240.0;
-
- // The max size of the view is when the sheet is taking up 85% of the screen.
- NSSize screenSize = [[NSScreen mainScreen] frame].size;
- NSSize sheetSize = [fPicturePanel frame].size;
- NSSize viewAreaSize = [fPictureGLViewArea frame].size;
- float paddingX = sheetSize.width - viewAreaSize.width;
- float paddingY = sheetSize.height - viewAreaSize.height;
- float maxWidth = (0.85 * screenSize.width) - paddingX;
- float maxHeight = (0.85 * screenSize.height) - paddingY;
-
- NSSize resultSize = imageSize;
-
- // Its better to have a view that's too small than a view that's too big, so
- // apply the maximum constraints last.
- if( resultSize.width < minWidth )
- {
- resultSize.height *= (minWidth / resultSize.width);
- resultSize.width = minWidth;
- }
- if( resultSize.height < minHeight )
- {
- resultSize.width *= (minHeight / resultSize.height);
- resultSize.height = minHeight;
- }
- if( resultSize.width > maxWidth )
- {
- resultSize.height *= (maxWidth / resultSize.width);
- resultSize.width = maxWidth;
- }
- if( resultSize.height > maxHeight )
- {
- resultSize.width *= (maxHeight / resultSize.height);
- resultSize.height = maxHeight;
- }
-
- return resultSize;
-}
-
-//
-// -[PictureController(Private) resizePanelForViewSize:animate:]
-//
-// Resizes the entire sheet to accomodate an OpenGL view of a particular size.
-//
-- (void)resizeSheetForViewSize: (NSSize)viewSize
-{
- // Figure out the deltas for the new frame area
- NSSize currentSize = [fPictureGLViewArea frame].size;
- float deltaX = viewSize.width - currentSize.width;
- float deltaY = viewSize.height - currentSize.height;
-
- // Now resize the whole panel by those same deltas, but don't exceed the min
- NSRect frame = [fPicturePanel frame];
- NSSize maxSize = [fPicturePanel maxSize];
- NSSize minSize = [fPicturePanel minSize];
- frame.size.width += deltaX;
- frame.size.height += deltaY;
- if( frame.size.width < minSize.width )
- {
- frame.size.width = minSize.width;
- }
- if( frame.size.height < minSize.height )
- {
- frame.size.height = minSize.height;
- }
-
- // But now the sheet is off-center, so also shift the origin to center it and
- // keep the top aligned.
- frame.origin.x -= (deltaX / 2.0);
- frame.origin.y -= deltaY;
-
- [fPicturePanel setFrame:frame display:YES animate:YES];
-}
-
-//
-// -[PictureController(Private) setViewSize:]
-//
-// Changes the OpenGL view's size and centers it vertially inside of its area.
-// Assumes resizeSheetForViewSize: has already been called.
-//
-- (void)setViewSize: (NSSize)viewSize
-{
- [fPictureGLView setFrameSize:viewSize];
-
- // center it vertically
- NSPoint origin = [fPictureGLViewArea frame].origin;
- origin.y += ([fPictureGLViewArea frame].size.height -
- [fPictureGLView frame].size.height) / 2.0;
- [fPictureGLView setFrameOrigin:origin];
-}
-
-//
-// -[PictureController(Private) viewNeedsToResizeToSize:]
-//
-// Returns YES if the view will need to resize to match the given size.
-//
-- (BOOL)viewNeedsToResizeToSize: (NSSize)newSize
-{
- NSSize viewSize = [fPictureGLView frame].size;
- return (newSize.width != viewSize.width || newSize.height != viewSize.height);
-}
-
-
-@end
OSDN Git Service
