Changeset 60 for trunk/Cocoa/Pester/Source/PSMovieAlertController.m

Timestamp:

01/05/03 23:02:48 (21 years ago)

Author:

Nicholas Riley

Message:

PSScriptAlert.m: Removed reference to NDAppleScriptObject.

PSMovieAlertController.[hm]: Added minimum sizing.

NJRCenteringMovieView.[hm]: Support for centering movie inside its
frame if the frame is too large for the movie; sizes movie
proportionally if necessary (not used in Pester).

NSImage-NJRExtensions.[hm]: Fixed copyright.

Read Me.rtfd: Updated with bug fixes.

PSMovieAlert.m: Note bug in NSMovieView, currently doesn't affect us.

NJRQTMediaPopUpButton.m: Work around background processor use bug when
NSMovieView has movie set but not playing.

NJRVoicePopUpButton.m: Removed obsolete comment.

PSApplication.m: Only show alarm set window on rapp if alerts aren't
expiring.

PSAlarms.[hm]: Added -alarmsExpiring for support of conditional
rapp window open feature in PSApplication.

PSAlarmSetController.m: Stop window update timer and movie playback on
hide, restart timer on activate - fixes background processor usage.

File:

• trunk/Cocoa/Pester/Source/PSMovieAlertController.m (modified) (4 diffs)

trunk/Cocoa/Pester/Source/PSMovieAlertController.m

@@ -12 +12 @@
 #import "NSMovie-NJRExtensions.h"
 #import <QuickTime/Movies.h>
-
-// XXX if you specify a truly tiny movie, obey the minimum window size to compensate
 
 @implementation PSMovieAlertController
@@ -36 +34 @@
     }
     delay = (GetMovieDuration((Movie)theMovie) - GetMovieTime((Movie)theMovie, NULL)) / (double)GetMovieTimeScale((Movie)theMovie);
+    // XXX should use a timebase callback for this instead (see NJRQTMediaPopUpButton); also, use QuickTimeÕs built-in loop functionality instead of rolling our own?
     [self performSelector: @selector(play) withObject: nil afterDelay: delay inModes: [NSArray arrayWithObject: NSDefaultRunLoopMode]];
 }
@@ -52 +51 @@
             float magnification = 1.0;
             NSSize movieSize;
+            NSSize minSize = [window minSize];
+            float windowFrameHeight = [window frame].size.height - [[window contentView] frame].size.height;
             NSRect frame;
-            screenRect.size.height -= [window frame].size.height - [[window contentView] frame].size.height; // account for height of window frame
+            screenRect.size.height -= windowFrameHeight;
+            minSize.height -= windowFrameHeight;
             while (1) {
                 movieSize = [movieView sizeForMagnification: magnification];
@@ -62 +64 @@
                     break;
             }
+            if (movieSize.width < minSize.width) movieSize.width = minSize.width;
+            if (movieSize.height < minSize.height) movieSize.width = minSize.height;
             [window setContentSize: movieSize];
             [window center];