gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-04-23 12:00:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Implemented animate resize.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@21240 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Fred Kiefer 2005-05-20 14:33:43 +00:00
parent 29db6affc8
commit 694ae7c56a
2 changed files with 85 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2005-05-20 Fred Kiefer <FredKiefer@gmx.de>
* Source/NSWindow.m (-center, -constrainFrameRect:toScreen:) Use
screen visibleFrame instead of frame.
* Source/NSWindow.m (-animationResizeTime:,
-setFrame:display:animate:) Implemented this methods.
2005-05-20 Fred Kiefer <FredKiefer@gmx.de>
* Headers/AppKit/NSResponder.h: Added new MacOSX methods.

85
Source/NSWindow.m
View file

@ -31,6 +31,8 @@
*/
#include "config.h"
#include <math.h>
#include <float.h>
#include <Foundation/NSDebug.h>
#include <Foundation/NSRunLoop.h>
@ -1687,21 +1689,90 @@ many times.
display: (BOOL)displayFlag
animate: (BOOL)animationFlag
{
// TODO
if (animationFlag)
{
// time that the resize is expected to take in seconds
NSTimeInterval resizeTime;
// velocity
NSRect v;
// time parameter
float t;
float tdiff;
v.origin.x = _frame.origin.x - frameRect.origin.x;
v.origin.y = _frame.origin.y - frameRect.origin.y;
v.size.width = _frame.size.width - frameRect.size.width;
v.size.height = _frame.size.height - frameRect.size.height;
resizeTime = [self animationResizeTime: frameRect];
tdiff = 0.1 / resizeTime;
[NSEvent startPeriodicEventsAfterDelay: 0 withPeriod: 0.02];
t = 1.0;
while (t > 0.0)
{
NSEvent *theEvent = [NSApp nextEventMatchingMask: NSPeriodicMask
untilDate: [NSDate distantFuture]
inMode: NSEventTrackingRunLoopMode
dequeue: YES];
if ([theEvent type] == NSPeriodic)
{
NSRect newFrame;
t -= tdiff;
if (t <= 0.0)
{
break;
}
// move
newFrame.origin.x = frameRect.origin.x + v.origin.x * t;
newFrame.origin.y = frameRect.origin.y + v.origin.y * t;
// strech
newFrame.size.width = frameRect.size.width + v.size.width * t;
newFrame.size.height = frameRect.size.height + v.size.height * t;
[self setFrame: newFrame display: displayFlag];
}
}
[NSEvent stopPeriodicEvents];
}
[self setFrame: frameRect display: displayFlag];
}
- (NSTimeInterval) animationResizeTime: (NSRect)newFrame
{
// TODO
NSLog(@"Method %s is not implemented for class %s",
"animationResizeTime:", "NSWindow");
return 333;
static float resizeTime = 0;
float maxDiff;
if (resizeTime == 0)
{
NSNumber *num;
num = [[NSUserDefaults standardUserDefaults] objectForKey: @"NSWindowResizeTime"];
if (num != nil)
{
resizeTime = [num floatValue];
}
else
{
resizeTime = 0.20;
}
}
// Find the biggest difference
maxDiff = abs(newFrame.origin.x - _frame.origin.x);
maxDiff = MAX(maxDiff, newFrame.origin.y - _frame.origin.y);
maxDiff = MAX(maxDiff, newFrame.size.width - _frame.size.width);
maxDiff = MAX(maxDiff, newFrame.size.height - _frame.size.height);
return (maxDiff * resizeTime) / 150;
}
- (void) center
{
NSSize screenSize = [[self screen] frame].size;
NSSize screenSize = [[self screen] visibleFrame].size;
NSPoint origin = _frame.origin;
origin.x = (screenSize.width - _frame.size.width) / 2;
@ -1716,7 +1787,7 @@ many times.
*/
- (NSRect) constrainFrameRect: (NSRect)frameRect toScreen: (NSScreen*)screen
{
NSRect screenRect = [screen frame];
NSRect screenRect = [screen visibleFrame];
float difference;
/* Move top edge of the window inside the screen */