strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

#i102807# adjust magnify event sensitivity to app expectations

Browse source
This commit is contained in:
Herbert Duerr [hdu] 2010-10-05 13:05:24 -07:00
parent 36524b9df5
commit b0e6ce3381
2 changed files with 45 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
vcl/aqua/inc/salframeview.h
View file

@ -77,6 +77,10 @@
id mpMouseEventListener;
id mDraggingDestinationHandler;
NSEvent* mpLastSuperEvent;
// #i102807# used by magnify event handler
NSTimeInterval mfLastMagnifyTime;
float mfMagnifyDeltaSum;
}
+(void)unsetMouseFrame: (AquaSalFrame*)pFrame;
-(id)initWithSalFrame: (AquaSalFrame*)pFrame;

65
vcl/aqua/source/window/salframeview.mm
View file

@ -378,6 +378,7 @@ static AquaSalFrame* getMouseContainerFrame()
mpLastSuperEvent = nil;
}
mfLastMagnifyTime = 0.0;
return self;
}
@ -637,21 +638,40 @@ private:
// TODO: ?? -(float)magnification;
if( AquaSalFrame::isAlive( mpFrame ) )
{
mpFrame->mnLastEventTime = static_cast<ULONG>( [pEvent timestamp] * 1000.0 );
{
const NSTimeInterval fMagnifyTime = [pEvent timestamp];
mpFrame->mnLastEventTime = static_cast<ULONG>( fMagnifyTime * 1000.0 );
mpFrame->mnLastModifierFlags = [pEvent modifierFlags];
float dZ = 0.0;
for(;;)
// check if this is a new series of magnify events
static const NSTimeInterval fMaxDiffTime = 0.3;
const bool bNewSeries = (fMagnifyTime - mfLastMagnifyTime > fMaxDiffTime);
if( bNewSeries )
mfMagnifyDeltaSum = 0.0;
mfMagnifyDeltaSum += [pEvent deltaZ];
mfLastMagnifyTime = [pEvent timestamp];
// TODO: change to 0.1 when COMMAND_WHEEL_ZOOM handlers allow finer zooming control
static const float fMagnifyFactor = 0.25;
static const float fMinMagnifyStep = 15.0 / fMagnifyFactor;
if( fabs(mfMagnifyDeltaSum) <= fMinMagnifyStep )
return;
// adapt NSEvent-sensitivity to application expectations
// TODO: rather make COMMAND_WHEEL_ZOOM handlers smarter
const float fDeltaZ = mfMagnifyDeltaSum * fMagnifyFactor;
int nDeltaZ = FRound( fDeltaZ );
if( !nDeltaZ )
{
dZ += [pEvent deltaZ];
NSEvent* pNextEvent = [NSApp nextEventMatchingMask: NSScrollWheelMask
untilDate: nil inMode: NSDefaultRunLoopMode dequeue: YES ];
if( !pNextEvent )
break;
pEvent = pNextEvent;
// handle new series immediately
if( !bNewSeries )
return;
nDeltaZ = (fDeltaZ >= 0.0) ? +1 : -1;
}
// eventually give credit for delta sum
mfMagnifyDeltaSum -= nDeltaZ / fMagnifyFactor;
NSPoint aPt = [NSEvent mouseLocation];
mpFrame->CocoaToVCL( aPt );
@ -667,18 +687,15 @@ private:
if( Application::GetSettings().GetLayoutRTL() )
aEvent.mnX = mpFrame->maGeometry.nWidth-1-aEvent.mnX;
if( dZ != 0.0 )
{
aEvent.mnDelta = static_cast<long>(floor(dZ));
aEvent.mnNotchDelta = dZ < 0 ? -1 : 1;
if( aEvent.mnDelta == 0 )
aEvent.mnDelta = aEvent.mnNotchDelta;
aEvent.mbHorz = FALSE;
aEvent.mnScrollLines = dZ > 0 ? dZ/WHEEL_EVENT_FACTOR : -dZ/WHEEL_EVENT_FACTOR;
if( aEvent.mnScrollLines == 0 )
aEvent.mnScrollLines = 1;
mpFrame->CallCallback( SALEVENT_WHEELMOUSE, &aEvent );
}
aEvent.mnDelta = nDeltaZ;
aEvent.mnNotchDelta = (nDeltaZ >= 0) ? +1 : -1;
if( aEvent.mnDelta == 0 )
aEvent.mnDelta = aEvent.mnNotchDelta;
aEvent.mbHorz = FALSE;
aEvent.mnScrollLines = nDeltaZ;
if( aEvent.mnScrollLines == 0 )
aEvent.mnScrollLines = 1;
mpFrame->CallCallback( SALEVENT_WHEELMOUSE, &aEvent );
}
}